// fix adminProducts > images

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10281 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 16:42:51 +00:00
parent c7310f3899
commit d6ef55b5ed
3 changed files with 152 additions and 132 deletions
@@ -919,7 +919,9 @@ class AdminControllerCore extends Controller
 				$this->object = new $this->className($id);
 			if (Validate::isLoadedObject($this->object))
 				return $this->object;
+			// throw exception
 			$this->_errors[] = Tools::displayError('Object cannot be loaded (not found)');
+			return false;
 		}
 		else if ($opt)
 		{
@@ -927,7 +929,10 @@ class AdminControllerCore extends Controller
 			return $this->object;
 		}
 		else
+		{
 			$this->_errors[] = Tools::displayError('Object cannot be loaded (identifier missing or invalid)');
+			return false;
+		}

 		$this->content = $this->displayErrors();
 		return $this->object;