fix include error in install.php

[jirafeau_mojo42.git] / lib / template / header.php

diff --git a/lib/template/header.php b/lib/template/header.php
index 264cf343e192e9e1a0f74d578726dde119cc8b73..5926555512cd48d41c20b5df652db36bfa5b7d41 100644 (file)
--- a/lib/template/header.php
+++ b/lib/template/header.php
@@ -8,9 +8,15 @@ if (stristr ($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml'))
 
 header('Content-Type: ' . $content_type);
 
 
 header('Content-Type: ' . $content_type);
 

+$protocol = (bool)is_ssl() ? 'https' : 'http';
+
+if ( !empty($cfg['web_root']) ) {
+    $cfg['web_root'] = preg_replace('#https?://#', $protocol . '://', $cfg['web_root'], 1);
+}
+

 /* Avoids irritating errors with the installer (no conf file is present then). */
 if (!isset ($cfg['web_root']))
 /* Avoids irritating errors with the installer (no conf file is present then). */
 if (!isset ($cfg['web_root']))

-    $web_root = 'http://' . $_SERVER['HTTP_HOST'] . '/';
+    $web_root = $protocol+'://' . $_SERVER['HTTP_HOST'] . '/';

 else
     $web_root = $cfg['web_root'];
 
 else
     $web_root = $cfg['web_root'];