aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-19 01:52:12 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-19 01:52:12 +0000
commit28c8c03eea840ca932d47208d1fdc556125b3343 (patch)
tree6b5fffc341d71d74ae849650b2ddece4b9f053f2
parent01435072dc7d9b46bc30a3216501684a72e716a1 (diff)
downloadelgg-28c8c03eea840ca932d47208d1fdc556125b3343.tar.gz
elgg-28c8c03eea840ca932d47208d1fdc556125b3343.tar.bz2
Fixing pluralization of singular options for elgg_get_metadata() and elgg_get_annotations().
git-svn-id: http://code.elgg.org/elgg/trunk@8761 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/metastrings.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/engine/lib/metastrings.php b/engine/lib/metastrings.php
index 8f9debcc0..4218659d9 100644
--- a/engine/lib/metastrings.php
+++ b/engine/lib/metastrings.php
@@ -312,9 +312,14 @@ function elgg_get_metastring_based_objects($options) {
}
}
- $singulars = array('type', 'subtype', 'guid', 'owner_guid', 'container_guid', 'site_guid',
- 'metastring_name', 'metastring_value', 'metastring_id'
- );
+ $singulars = array(
+ 'type', 'subtype', 'type_subtype_pair',
+ 'guid', 'owner_guid', 'container_guid', 'site_guid',
+ 'metastring_name', 'metastring_value',
+ 'metastring_owner_guid', 'metastring_id',
+ 'select', 'where', 'join'
+ );
+
$options = elgg_normalise_plural_options_array($options, $singulars);
if (!$options) {