// 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
@@ -58,7 +58,7 @@ class ZoneCore extends ObjectModel
 	*
 	* @return array Zones
 	*/
-	static public function getZones($active = false)
+	public static function getZones($active = false)
 	{
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
 		SELECT *
@@ -72,7 +72,7 @@ class ZoneCore extends ObjectModel
 	*
 	* @return integer id_zone
 	*/
-	static public function getIdByName($name)
+	public static function getIdByName($name)
 	{
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
 		SELECT `id_zone`