From 1c0bda3d9868cf62788eaf88317af35326e0b4e7 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Tue, 8 Nov 2011 06:45:18 -0500
Subject: it is GPL General Public License not GPL Public License

---
 mod/blog/manifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/blog')

diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
index bd5f9c396..29ee1bfc8 100644
--- a/mod/blog/manifest.xml
+++ b/mod/blog/manifest.xml
@@ -10,7 +10,7 @@
 	<description>Adds simple blogging capabilities to your Elgg installation.</description>
 	<website>http://elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
-- 
cgit v1.2.3


From 87e274201939458768808d3728a8fef9ef23e0d9 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 4 Dec 2011 13:04:02 -0500
Subject: removed some usage of deprecated methods

---
 engine/tests/regression/trac_bugs.php        | 2 +-
 mod/blog/actions/blog/auto_save_revision.php | 2 +-
 mod/blog/actions/blog/save.php               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'mod/blog')

diff --git a/engine/tests/regression/trac_bugs.php b/engine/tests/regression/trac_bugs.php
index 2bfc37558..99cf81774 100644
--- 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 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) {
-- 
cgit v1.2.3