Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 10 insertions, 1 deletions

diff --git a/engine/tests/api/entity_getter_functions.php b/engine/tests/api/entity_getter_functions.php
index aef7a991e..e7906d3c8 100644
--- a/engine/tests/api/entity_getter_functions.php
+++ b/engine/tests/api/entity_getter_functions.php
@@ -855,7 +855,7 @@ class ElggCoreEntityGetterFunctionsTest extends ElggCoreUnitTest {
 
 	public function testElggApiGettersEntityNoSubtype() {
 		// create an entity we can later delete.
-		// order by time created and limit by 1 should == this entity.
+		// order by guid and limit by 1 should == this entity.
 
 		$e = new ElggObject();
 		$e->save();
@@ -2789,4 +2789,13 @@ class ElggCoreEntityGetterFunctionsTest extends ElggCoreUnitTest {
 			$this->assertEqual($a_e_map[$a->id], $a->owner_guid);
 		}
 	}
+
+	public function testElggGetEntitiesBadWheres() {
+		$options = array(
+			'container_guid' => 'abc'
+		);
+
+		$entities = elgg_get_entities($options);
+		$this->assertFalse($entities);
+	}
 }