More fixes to annotations/metadata changes. Now all function support getting via a metastring id.

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

3 files changed, 9 insertions, 2 deletions

diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index d4483ab82..c37596ea8 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -172,6 +172,8 @@ function update_annotation($annotation_id, $name, $value, $value_type, $owner_gu
  *
  * 	annotation_values => NULL|ARR Annotation values
  *
+ * 	annotation_ids => NULL|ARR annotation ids
+ *
  * 	annotation_case_sensitive => BOOL Overall Case sensitive
  *
  *  annotation_owner_guids => NULL|ARR guids for annotation owners
diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
index c3aebb111..08c87ae67 100644
--- a/engine/lib/metadata.php
+++ b/engine/lib/metadata.php
@@ -259,6 +259,8 @@ $access_id = ACCESS_PRIVATE, $allow_multiple = false) {
  *
  * 	metadata_values => NULL|ARR metadata values
  *
+* 	metadata_ids => NULL|ARR metadata ids
+ *
  * 	metadata_case_sensitive => BOOL Overall Case sensitive
  *
  *  metadata_owner_guids => NULL|ARR guids for metadata owners
diff --git a/engine/lib/metastrings.php b/engine/lib/metastrings.php
index 3367b433f..6376ac09b 100644
--- a/engine/lib/metastrings.php
+++ b/engine/lib/metastrings.php
@@ -215,6 +215,8 @@ function delete_orphaned_metastrings() {
  *
  * 	metastring_values => NULL|ARR metastring values
  *
+ * 	metastring_ids => NULL|ARR metastring ids
+ *
  * 	metastring_case_sensitive => BOOL Overall Case sensitive
  *
  *  metastring_owner_guids => NULL|ARR guids for metadata owners
@@ -593,11 +595,12 @@ function elgg_normalize_metastrings_options(array $options = array()) {
 		'owner_guids' 			=>	'metastring_owner_guids',
 		'created_time_lower'	=>	'metastring_created_time_lower',
 		'created_time_upper'	=>	'metastring_created_time_upper',
-		'calculation'			=>	'metastring_calculation'
+		'calculation'			=>	'metastring_calculation',
+		'ids'					=>	'metastring_ids'
 	);
 
 	foreach ($prefixes as $prefix) {
-		$singulars = array("{$prefix}name", "{$prefix}value", "{$prefix}owner_guid");
+		$singulars = array("{$prefix}name", "{$prefix}value", "{$prefix}owner_guid", "{$prefix}id");
 		$options = elgg_normalise_plural_options_array($options, $singulars);
 
 		foreach ($map as $specific => $normalized) {