// MERGE with 1.4 r7770

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
@@ -27,7 +27,7 @@ class DejalaCart extends ObjectModel
 	private static $INSTANCES = array() ;
 	private $djlCart ;

-	static public function getInstance($id) 
+	public static function getInstance($id) 
 	{
 		if (!isset(self::$INSTANCES[$id]))
        	self::$INSTANCES[$id] = new DejalaCart($id);