From a8f4ec0450031071159048e78fc8af4ceb3e6758 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 16 Jul 2013 19:33:06 -0400
Subject: [PATCH] Simplify whitelist logic.

---
 lib/Cake/Controller/Component/PaginatorComponent.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/Cake/Controller/Component/PaginatorComponent.php b/lib/Cake/Controller/Component/PaginatorComponent.php
index c7a0201dce3..e5d5fb42537 100644
--- 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'])) {