Fix error when page settings emtpy

rbnvrw · Jan 28, 2015 · 770f433 · 770f433
1 parent 6b37cf9
commit 770f433
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/app/Crispus/Filesystem.php b/app/Crispus/Filesystem.php
@@ -92,7 +92,13 @@ private function getPageFromDir($sDir, $sUrl, $sGlobalConfigFile){
 	    $sNewUrl = $sUrl.'/'.$sDir;
 
 	    $oPage = new Page($sNewUrl, $sGlobalConfigFile);
-	    $aConfig = array_change_key_case($oPage->getConfig(), CASE_LOWER);
+	    $aConfig = $oPage->getConfig();
+
+		if(is_array($aConfig)){
+		    $aConfig = array_change_key_case($aConfig, CASE_LOWER);
+		}else{
+		    $aConfig = array();
+		}
 
 	    return array('name' => $sDir, 'url' => $sNewUrl, 'config' => $aConfig, 'children' => $oPage->getChildren());
 	}

diff --git a/app/Crispus/Page.php b/app/Crispus/Page.php
@@ -95,7 +95,13 @@ private function setConfig(){
 		}
 
 		$oPageConfig = new Config($this->sPath.'/'.$this->sConfigFile);
-		$this->aConfig = array_change_key_case($oPageConfig->getConfig(), CASE_LOWER);
+		$aConfig = $oPageConfig->getConfig();
+
+		if(is_array($aConfig)){
+		    $this->aConfig = array_change_key_case($oPageConfig->getConfig(), CASE_LOWER);
+		}else{
+		    $this->aConfig = array();
+		}
 
 		// Set page template
 		if(isset($this->aConfig['template']) && !empty($this->aConfig['template'])){

diff --git a/app/Crispus/Theme.php b/app/Crispus/Theme.php
@@ -46,7 +46,11 @@ public function renderPage() {
 
 	public function setPageConfig($aConfig) {
 		if(is_array($aConfig)){
-			$this->aPageConfig = array_change_key_case($aConfig, CASE_LOWER);
+			if(is_array($aConfig)){
+		        $this->aPageConfig = array_change_key_case($aConfig, CASE_LOWER);
+		    }else{
+		        $this->aPageConfig = array();
+		    }
 		}
 	}