diff --git a/system/Models/Folder.php b/system/Models/Folder.php index 1c001c2..9c49a81 100644 --- a/system/Models/Folder.php +++ b/system/Models/Folder.php @@ -338,9 +338,9 @@ class Folder public static function getPagingForItem($content, $item) { # if page is home - if(trim($item->pathWithoutType, "/") == 'index') + if(trim($item->pathWithoutType, DIRECTORY_SEPARATOR) == 'index') { - return $item; + return $item; } $keyPos = count($item->keyPathArray)-1; diff --git a/system/system.php b/system/system.php index 74f25a6..1fdd891 100644 --- a/system/system.php +++ b/system/system.php @@ -30,7 +30,7 @@ $settings = Typemill\Settings::loadSettings(); * HANDLE DISPLAY ERRORS * ****************************/ -if($settings['settings']['displayErrorDetails']) +if(isset($settings['settings']['displayErrorDetails']) && $settings['settings']['displayErrorDetails']) { ini_set('display_errors', 1); ini_set('display_startup_errors', 1);