// merge 1.4 (5397)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6048 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-22 16:00:58 +00:00
parent 7b4eda5137
commit 43b6a41bbc
126 changed files with 3390 additions and 1430 deletions
@@ -1291,7 +1291,7 @@ class AdminImport extends AdminTab
 		return sizeof($tmp);
 	}

-	private function _usortFiles($a, $b)
+	private static function _usortFiles($a, $b)
 	{
 		$a = strrev(substr(strrev($a), 0, 14));
 		$b = strrev(substr(strrev($b), 0, 14));