removed some usage of deprecated methods

diff --git a/engine/tests/regression/trac_bugs.php b/engine/tests/regression/trac_bugs.php
index 2bfc37558559ad530031011f3163d5bb97578b68..99cf8177445523d2b34c7f15d7f83d9b6a96e5c3 100644 (file)
--- a/engine/tests/regression/trac_bugs.php
+++ b/engine/tests/regression/trac_bugs.php
@@ -45,7 +45,7 @@ class ElggCoreRegressionBugsTest extends ElggCoreUnitTest {
        /**
         * #1558
         */
-       public function testElggObjectClearAnnotations() {
+       public function testElggObjectDeleteAnnotations() {
                $this->entity = new ElggObject();
                $guid = $this->entity->save();
 

diff --git a/mod/blog/actions/blog/auto_save_revision.php b/mod/blog/actions/blog/auto_save_revision.php
index 1acf3b31b18dc02def6fc9d1596d5441161b575b..66b65c5fddee03dba771beca2625e8e1241a62bc 100644 (file)
--- a/mod/blog/actions/blog/auto_save_revision.php
+++ b/mod/blog/actions/blog/auto_save_revision.php
@@ -63,7 +63,7 @@ if ($title && $description) {
                if (!$auto_save) {
                        $annotation_id = $blog->annotate('blog_auto_save', $description);
                } elseif ($auto_save instanceof ElggAnnotation && $auto_save->value != $description) {
-                       $blog->clearAnnotations('blog_auto_save');
+                       $blog->deleteAnnotations('blog_auto_save');
                        $annotation_id = $blog->annotate('blog_auto_save', $description);
                } elseif ($auto_save instanceof ElggAnnotation && $auto_save->value == $description) {
                        // this isn't an error because we have an up to date annotation.

diff --git a/mod/blog/actions/blog/save.php b/mod/blog/actions/blog/save.php
index 8be67ec6c34868c4cf2ffba8bce341057d061bc8..8ca8ce84676980ef8f9f6d23130490bd80e50a96 100644 (file)
--- a/mod/blog/actions/blog/save.php
+++ b/mod/blog/actions/blog/save.php
@@ -131,10 +131,10 @@ if (!$error) {
                elgg_clear_sticky_form('blog');
 
                // remove autosave draft if exists
-               $blog->clearAnnotations('blog_auto_save');
+               $blog->deleteAnnotations('blog_auto_save');
 
                // no longer a brand new post.
-               $blog->clearMetadata('new_post');
+               $blog->deleteMetadata('new_post');
 
                // if this was an edit, create a revision annotation
                if (!$new_post && $revision_text) {