Merged type_subtype_pair fix from 1.7 branch.

git-svn-id: http://code.elgg.org/elgg/trunk@5789 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 88cf3e3a7079994c9ad85011c17f75c5ac81915a..fcdc1ee6c5cbfe2c667cd092f8271a239549a4e6 100644 (file)
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1812,7 +1812,7 @@ function elgg_get_entities(array $options = array()) {
 
        $options = array_merge($defaults, $options);
 
-       $singulars = array('type', 'subtype', 'owner_guid', 'container_guid', 'site_guid');
+       $singulars = array('type', 'subtype', 'owner_guid', 'container_guid', 'site_guid', 'type_subtype_pair');
        $options = elgg_normalise_plural_options_array($options, $singulars);
 
        // evaluate where clauses