From 876b4c09bc3d3293dda15459340c4228b135b8d0 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Wed, 13 Feb 2013 19:53:48 +0100
Subject: [PATCH] [-] CORE : Fix warning  when result from query is not a
 ressource

---
 classes/db/MySQL.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/classes/db/MySQL.php b/classes/db/MySQL.php
index 2713305d8..b8db3dbd6 100644
--- a/classes/db/MySQL.php
+++ b/classes/db/MySQL.php
@@ -68,7 +68,12 @@ class MySQLCore extends Db
 	 */
 	public function nextRow($result = false)
 	{
-		return mysql_fetch_assoc($result ? $result : $this->result);
+		$return = false;
+		if(is_resource($result) && $result)
+			$return = mysql_fetch_assoc($result);
+		elseif(is_resource($this->_result) && $this->_result)
+			$return = mysql_fetch_assoc($this->_result);
+		return $return;	
 	}
 
 	/**