From 296075a47dbd690bffc96c7d31da031200699751 Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sun, 28 Oct 2007 19:15:29 +0100 Subject: [PATCH] Oops, fix 45319df (default value for baseurl) Signed-off-by: Florent Bruneau --- include/globals.inc.php.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/globals.inc.php.in b/include/globals.inc.php.in index 37a8cfe..53e9339 100644 --- a/include/globals.inc.php.in +++ b/include/globals.inc.php.in @@ -51,14 +51,14 @@ class PlatalGlobals public function __construct($sess) { $this->session = $sess; + $this->spoolroot = dirname(dirname(__FILE__)); - $base = empty($_SERVER['HTTPS']) ? 'http://' : 'https://'; + $this->read_config(); if (isset($_SERVER) && isset($_SERVER['SERVER_NAME'])) { + $base = empty($_SERVER['HTTPS']) ? 'http://' : 'https://'; $this->baseurl = @trim($base.$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']), '/'); } - $this->spoolroot = dirname(dirname(__FILE__)); - $this->read_config(); $this->setlocale(); } -- 2.1.4