Simplify whitelist logic.

cakephp · Jul 16, 2013 · a8f4ec0 · a8f4ec0
1 parent d4db64f
commit a8f4ec0
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/lib/Cake/Controller/Component/PaginatorComponent.php b/lib/Cake/Controller/Component/PaginatorComponent.php
@@ -377,11 +377,8 @@ public function validateSort(Model $object, array $options, array $whitelist = a
 			$inWhitelist = in_array($field, $whitelist, true);
 			if (!$inWhitelist) {
 				$options['order'] = null;
-				return $options;
-			}
-			if ($inWhitelist) {
-				return $options;
 			}
+			return $options;
 		}
 
 		if (!empty($options['order']) && is_array($options['order'])) {