Fixing pluralization of singular options for elgg_get_metadata() and elgg_get_annotat...

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

diff --git a/engine/lib/metastrings.php b/engine/lib/metastrings.php
index 8f9debcc0bdc631c4907b75004ded61c926aaf23..4218659d93b4449d0ac2809a43ea50dfca79005c 100644 (file)
--- 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) {