// Merge -> revision 8507

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8513 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 16:17:37 +00:00
parent 3c6a0944fa
commit b50c7e4334
67 changed files with 1938 additions and 1509 deletions
@@ -1941,15 +1941,13 @@ FileETag INode MTime Size
 			case 'by' :
 				$orderByPrefix = '';
 				if($prefix) {
-					if ($value == 'id_product' OR	$value == 'date_add')
+					if ($value == 'id_product' || $value == 'date_add' || $value == 'price')
 						$orderByPrefix = 'p.';
 					elseif ($value == 'name')
 						$orderByPrefix = 'pl.';
 					elseif ($value == 'manufacturer')
-					{
 						$orderByPrefix = 'm.';
-					}
-					elseif ($value == 'position')
+					elseif ($value == 'position' || empty($value))
 						$orderByPrefix = 'cp.';
 				}