From e5d5443cbe44c6fc48d9fe6ecb1b433599a5bd56 Mon Sep 17 00:00:00 2001 From: rMalie Date: Mon, 30 Jan 2012 14:08:36 +0000 Subject: [PATCH] // Fix assignements in if() on AdminTab git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12803 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/AdminTab.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/AdminTab.php b/classes/AdminTab.php index 82d5bba52..eea20ef85 100644 --- a/classes/AdminTab.php +++ b/classes/AdminTab.php @@ -370,7 +370,7 @@ abstract class AdminTabCore { /* New tab loading */ $classname = 'Admin'.$subtab; - if ($module = Db::getInstance()->getValue('SELECT `module` FROM `'._DB_PREFIX_.'tab` WHERE `class_name` = \''.pSQL($classname).'\'') && file_exists(_PS_MODULE_DIR_.'/'.$module.'/'.$classname.'.php')) + if (($module = Db::getInstance()->getValue('SELECT `module` FROM `'._DB_PREFIX_.'tab` WHERE `class_name` = \''.pSQL($classname).'\'')) && file_exists(_PS_MODULE_DIR_.'/'.$module.'/'.$classname.'.php')) include_once(_PS_MODULE_DIR_.'/'.$module.'/'.$classname.'.php'); elseif (file_exists(_PS_ADMIN_DIR_.'/tabs/'.$classname.'.php')) include_once('tabs/'.$classname.'.php'); @@ -1085,7 +1085,7 @@ abstract class AdminTabCore $max_size = isset($this->maxImageSize) ? $this->maxImageSize : 0; if ($error = ImageManager::validateUpload($_FILES[$name], Tools::getMaxUploadSize($max_size))) $this->_errors[] = $error; - elseif (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS') || !move_uploaded_file($_FILES[$name]['tmp_name'], $tmpName)) + elseif (!($tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS')) || !move_uploaded_file($_FILES[$name]['tmp_name'], $tmpName)) return false; else {