From 984d4c0bfc4cdbba9060eaea16323a6c20212e29 Mon Sep 17 00:00:00 2001 From: brettp Date: Fri, 16 Apr 2010 21:58:58 +0000 Subject: Merged type_subtype_pair fix from 1.7 branch. git-svn-id: http://code.elgg.org/elgg/trunk@5789 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/entities.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/lib/entities.php b/engine/lib/entities.php index 88cf3e3a7..fcdc1ee6c 100644 --- 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 -- cgit v1.2.3