Removed last of deprecated metadata calls in trunk.

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

diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php
index 1be1d5d15caf32111f8d2d7595c1cb5e557bf6ef..e0d46f5a7601408f36504bc4eb1a569116b84284 100644 (file)
--- a/engine/classes/ElggEntity.php
+++ b/engine/classes/ElggEntity.php
@@ -294,7 +294,7 @@ abstract class ElggEntity extends ElggData implements
                        unset($this->temp_metadata[$name]);
                        foreach ($value as $v) {
                                if ((int) $this->guid > 0) {
-                                       elgg_delete_metadata(array('guid' => $this->guid, 'metadata_name' => $name));
+                                       elgg_delete_metadata(array('guid' => $this->guid, 'metadata_name' => $name, 'limit' => 0));
                                        $multiple = true;
                                        if (!create_metadata($this->getGUID(), $name, $v, $value_type,
                                        $this->getOwnerGUID(), $this->getAccessID(), $multiple)) {

diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
index c05e0b161d30654ee7a8173e8606a88cc3e28b24..230bce50fcca3c86bba86c1b70c708484486e5f0 100644 (file)
--- a/engine/lib/metadata.php
+++ b/engine/lib/metadata.php
@@ -135,7 +135,7 @@ function create_metadata($entity_guid, $name, $value, $value_type, $owner_guid,
                        if (elgg_trigger_event('create', 'metadata', $obj)) {
                                return $id;
                        } else {
-                               delete_metadata($id);
+                               elgg_delete_metadata_by_id($id);
                        }
                }
        }
@@ -219,7 +219,7 @@ function update_metadata($id, $name, $value, $value_type, $owner_guid, $access_i
                if (elgg_trigger_event('update', 'metadata', $obj)) {
                        return true;
                } else {
-                       delete_metadata($id);
+                       elgg_delete_metadata_by_id($id);
                }
        }