From c6fa7b510dc938a14ddd1d2ecf2c98017924b9da Mon Sep 17 00:00:00 2001 From: brettp Date: Mon, 14 Feb 2011 01:24:51 +0000 Subject: Refs #2912. Added checks for constraints in dangerous functions. Unit tests no longer remove all metadata/annotations. git-svn-id: http://code.elgg.org/elgg/trunk@8215 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/metadata.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'engine/lib/metadata.php') diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php index 8a62929d5..c3aebb111 100644 --- a/engine/lib/metadata.php +++ b/engine/lib/metadata.php @@ -281,13 +281,15 @@ function elgg_get_metadata(array $options = array()) { * Deletes metadata based on $options. * * @warning Unlike elgg_get_metadata() this will not accept an empty options array! + * This requires some constraints: metadata_owner_guid(s), + * metadata_name(s), metadata_value(s), or limit must be set. * * @param array $options An options array. {@See elgg_get_metadata()} * @return mixed * @since 1.8 */ function elgg_delete_metadata(array $options) { - if (!$options || !is_array($options)) { + if (!elgg_is_valid_options_for_batch_operation($options, 'metadata')) { return false; } @@ -305,7 +307,7 @@ function elgg_delete_metadata(array $options) { * @since 1.8 */ function elgg_disable_metadata(array $options) { - if (!$options || !is_array($options)) { + if (!elgg_is_valid_options_for_batch_operation($options, 'metadata')) { return false; } -- cgit v1.2.3