diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-04-16 21:58:58 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-04-16 21:58:58 +0000 |
| commit | 984d4c0bfc4cdbba9060eaea16323a6c20212e29 (patch) | |
| tree | 7f9514cbc42166503b766231e3f577247c730771 /engine | |
| parent | e6bf977c85f9df266a8a1c188d2076b969eaffda (diff) | |
| download | elgg-984d4c0bfc4cdbba9060eaea16323a6c20212e29.tar.gz elgg-984d4c0bfc4cdbba9060eaea16323a6c20212e29.tar.bz2 | |
Merged type_subtype_pair fix from 1.7 branch.
git-svn-id: http://code.elgg.org/elgg/trunk@5789 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/entities.php | 2 |
1 files changed, 1 insertions, 1 deletions
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 |