Fixes #4269. Not using ElggBatch to delete metadata / annotations. Added unit tests for deleting annotations/md. Fixed an annoying inconsistency with "metastring/s" option in private functions.

1 files changed, 30 insertions, 2 deletions

diff --git a/engine/lib/metastrings.php b/engine/lib/metastrings.php
index d8fef6f1c..62b60e279 100644
--- a/engine/lib/metastrings.php
+++ b/engine/lib/metastrings.php
@@ -727,10 +727,38 @@ function elgg_batch_metastring_based_objects(array $options, $callback) {
 		return false;
 	}
 
-	$batch = new ElggBatch('elgg_get_metastring_based_objects', $options, $callback);
-	$r = $batch->callbackResult;
+	switch($options['metastring_type']) {
+		case 'metadata':
+			$objects = elgg_get_metadata($options);
+			break;
+
+		case 'annotations':
+			$objects = elgg_get_annotations($options);
+			break;
+
+		default:
+			return false;
+	}
+
+	if (!is_array($objects)) {
+		$r = false;
+	} elseif (empty($objects)) {
+		// ElggBatch returns null if the results are an empty array
+		$r = null;
+	} else {
+		$r = true;
+		foreach($objects as $object) {
+			$r = $r && $callback($object);
+		}
+	}
 
 	return $r;
+
+//	// @todo restore once ElggBatch supports callbacks that delete rows.
+//	$batch = new ElggBatch('elgg_get_metastring_based_objects', $options, $callback);
+//	$r = $batch->callbackResult;
+//
+//	return $r;
 }
 
 /**