// merge 1.4 => 6117

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6118 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-29 09:09:38 +00:00
parent e60a8b9203
commit 56099fa735
29 changed files with 199 additions and 217 deletions
@@ -319,7 +319,7 @@ abstract class AdminTabCore
 	public function includeSubTab($methodname, $actions = array())
 	{
 		if (!isset($this->_includeTab) OR !is_array($this->_includeTab))
-			return ;
+			return false;
 		$key = 0;
 		$inc = false;
 		foreach ($this->_includeTab as $subtab => $extraVars)
@@ -1553,7 +1553,7 @@ abstract class AdminTabCore
 		global $currentIndex, $cookie, $tab;

 		if (!isset($this->_fieldsOptions) OR !sizeof($this->_fieldsOptions))
-			return ;
+			return false;

 		$defaultLanguage = (int)Configuration::get('PS_LANG_DEFAULT');
 		$this->_languages = Language::getLanguages(false);