Fix errors generated when option['order'] is undefined.

Fixes #2447
cakephp · Jan 9, 2012 · f4c27e0 · f4c27e0
1 parent 3c48552
commit f4c27e0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/lib/Cake/Controller/Component/PaginatorComponent.php b/lib/Cake/Controller/Component/PaginatorComponent.php
@@ -333,7 +333,7 @@ public function validateSort($object, $options, $whitelist = array()) {
 			$options['order'] = array($options['sort'] => $direction);
 		}
 
-		if (!empty($whitelist)) {
+		if (!empty($whitelist) && isset($options['order']) && is_array($options['order'])) {
 			$field = key($options['order']);
 			if (!in_array($field, $whitelist)) {
 				$options['order'] = null;

diff --git a/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php b/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
@@ -776,6 +776,26 @@ public function testValidateSortMultiple() {
 		$this->assertEquals($expected, $result['order']);
 	}
 
+/**
+ * Test that no sort doesn't trigger an error.
+ *
+ * @return void
+ */
+	public function testValidateSortNoSort() {
+		$model = $this->getMock('Model');
+		$model->alias = 'model';
+		$model->expects($this->any())->method('hasField')->will($this->returnValue(true));
+
+		$options = array('direction' => 'asc');
+		$result = $this->Paginator->validateSort($model, $options, array('title', 'id'));
+		$this->assertFalse(isset($result['order']));
+
+		$options = array('order' => 'invalid desc');
+		$result = $this->Paginator->validateSort($model, $options, array('title', 'id'));
+
+		$this->assertEquals($options['order'], $result['order']);
+	}
+
 /**
  * test that maxLimit is respected
  *