Merge branch 'gh149' into integration

jpfuentes2 · Sep 12, 2011 · a3c4601 · dre1080 · Sep 17, 2011 · a3c4601
2 parents a21e9fb + d1d68e7
commit a3c4601
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/Model.php b/lib/Model.php
@@ -1404,7 +1404,7 @@ public static function count(/* ... */)
 		$options = static::extract_and_validate_options($args);
 		$options['select'] = 'COUNT(*)';
 
-		if (!empty($args))
+		if (!empty($args) && !is_null($args[0]) && !empty($args[0]))
 		{
 			if (is_hash($args[0]))
 				$options['conditions'] = $args[0];

diff --git a/test/ActiveRecordFindTest.php b/test/ActiveRecordFindTest.php
@@ -226,6 +226,13 @@ public function test_count()
 		$this->assert_equals(1,Author::count(array('name' => 'Tito', 'author_id' => 1)));
 	}
 
+	public function test_gh149_empty_count()
+	{
+		$total = Author::count();
+		$this->assert_equals($total, Author::count(null));
+		$this->assert_equals($total, Author::count(array()));
+	}
+
 	public function test_exists()
 	{
 		$this->assert_true(Author::exists(1));