diff options
| author | cash <cash.costello@gmail.com> | 2011-12-08 18:24:29 -0500 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2011-12-08 18:24:29 -0500 |
| commit | c6f8f70f0fd86edf35f6efdef08ff44cb0429778 (patch) | |
| tree | ae97b0d2a4577c21f169f46735742dcb59fed569 /mod/blog | |
| parent | 19a8af878b74dd9e840fb45c1be4c3a61e93cd64 (diff) | |
| parent | 57e3793a560b9b376b037d5bfe3f1aafaa90c78d (diff) | |
| download | elgg-c6f8f70f0fd86edf35f6efdef08ff44cb0429778.tar.gz elgg-c6f8f70f0fd86edf35f6efdef08ff44cb0429778.tar.bz2 | |
Merge branch '1.8'
Diffstat (limited to 'mod/blog')
| -rw-r--r-- | mod/blog/actions/blog/auto_save_revision.php | 2 | ||||
| -rw-r--r-- | mod/blog/actions/blog/save.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mod/blog/actions/blog/auto_save_revision.php b/mod/blog/actions/blog/auto_save_revision.php index 1acf3b31b..66b65c5fd 100644 --- 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 8be67ec6c..8ca8ce846 100644 --- 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) { |