From c2477901ff55abf000e67a1166ad9ee20b5e3835 Mon Sep 17 00:00:00 2001 From: Diego Najar Date: Sun, 21 Jun 2015 21:19:41 -0300 Subject: [PATCH] Fixes for Windows and Webservers --- install.php | 3 ++- kernel/boot/init.php | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/install.php b/install.php index e19a6504..20b888e6 100644 --- a/install.php +++ b/install.php @@ -15,7 +15,8 @@ define('PATH_DATABASES', PATH_CONTENT.'databases'.DS); define('PATH_PLUGINS_DATABASES', PATH_CONTENT.'databases'.DS.'plugins'.DS); define('DOMAIN', getenv('HTTP_HOST')); -$base = (dirname(getenv('SCRIPT_NAME'))==DS)?DS:dirname(getenv('SCRIPT_NAME')).DS; +// HTML PATHs +$base = (dirname(getenv('SCRIPT_NAME'))==DS)?'/':dirname(getenv('SCRIPT_NAME')).'/'; define('HTML_PATH_ROOT', $base); if(!defined('JSON_PRETTY_PRINT')) { diff --git a/kernel/boot/init.php b/kernel/boot/init.php index a27f6d32..bb570604 100644 --- a/kernel/boot/init.php +++ b/kernel/boot/init.php @@ -108,13 +108,8 @@ $Url = new Url(); $Parsedown = new Parsedown(); // HTML PATHs -$tmp = dirname(getenv('SCRIPT_NAME')); -if($tmp!='/') { - define('HTML_PATH_ROOT', $tmp.'/'); -} -else { - define('HTML_PATH_ROOT', $tmp); -} +$base = (dirname(getenv('SCRIPT_NAME'))==DS)?'/':dirname(getenv('SCRIPT_NAME')).'/'; +define('HTML_PATH_ROOT', $base); define('HTML_PATH_THEMES', HTML_PATH_ROOT.'themes/'); define('HTML_PATH_THEME', HTML_PATH_ROOT.'themes/'.$Site->theme().'/');