Merge branch 'master' into dev

UnionOfRAD · Jul 19, 2013 · c7416ab · c7416ab
2 parents 467e0b9 + 20ff5b1
commit c7416ab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/data/source/Database.php b/data/source/Database.php
@@ -1243,7 +1243,7 @@ protected function _sort($field, $context, $clause = 'ORDER BY', $direction = tr
 			$field = array($field => $direction);
 		}
 
-		if (!is_array($field)) {
+		if (!is_array($field) || empty($field)) {
 			return;
 		}
 		$result = array();

diff --git a/tests/cases/data/source/DatabaseTest.php b/tests/cases/data/source/DatabaseTest.php
@@ -607,6 +607,10 @@ public function testOrder() {
 		$result = $this->_db->order(array('author_id', "title" => "DESC"), $query);
 		$expected = 'ORDER BY {MockDatabasePost}.{author_id} ASC, {MockDatabasePost}.{title} DESC';
 		$this->assertEqual($expected, $result);
+
+		$result = $this->_db->order(array(), $query);
+		$expected = '';
+		$this->assertEqual($expected, $result);
 	}
 
 	public function testOrderOnRelated() {