Changeset 39 for trunk/lib/App.inc.php

Timestamp:

Dec 15, 2005 9:24:53 PM (19 years ago)

Author:

scdev

Message:

${1}

File:

• trunk/lib/App.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -42 +42 @@
         'site_name' => null,
         'site_email' => null,
+        'site_url' => '', // URL automatically determined by _SERVER['HTTP_HOST'] if not set here.
 
         // The location the user will go if the system doesn't knew where else to send them.
@@ -313 +314 @@
         // and is used whenever a URL need be used to the current site.
         // Not available on cli scripts obviously.
-        if (isset($_SERVER['HTTP_HOST']) && '' != $_SERVER['HTTP_HOST']) {
+        if (isset($_SERVER['HTTP_HOST']) && '' != $_SERVER['HTTP_HOST'] && '' != $this->getParam('site_url')) {
             $this->setParam(array('site_url' => sprintf('%s://%s', ('on' == getenv('HTTPS') ? 'https' : 'http'), getenv('HTTP_HOST'))));
         }