From 46c278c3603765b623fa441e2435274fbeda05ad Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 22 Aug 2010 20:58:21 +0000
Subject: Merged r6620:6653 from 1.7 branch into trunk

git-svn-id: http://code.elgg.org/elgg/trunk@6846 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/blog/actions/blog/auto_save_revision.php | 2 +-
 mod/blog/actions/blog/delete.php             | 2 ++
 mod/blog/actions/blog/save.php               | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'mod/blog/actions/blog')

diff --git a/mod/blog/actions/blog/auto_save_revision.php b/mod/blog/actions/blog/auto_save_revision.php
index 00b24acce..9d5fe3ea7 100644
--- a/mod/blog/actions/blog/auto_save_revision.php
+++ b/mod/blog/actions/blog/auto_save_revision.php
@@ -41,7 +41,7 @@ if ($title && $description) {
 		$blog->access_id = ACCESS_PRIVATE;
 		$blog->title = $title;
 		$blog->description = $description;
-		$blog->excerpt = elgg_make_excerpt($excerpt);
+		$blog->excerpt = elgg_get_excerpt($excerpt);
 		// must be present or doesn't show up when metadata sorting.
 		$blog->publish_date = time();
 
diff --git a/mod/blog/actions/blog/delete.php b/mod/blog/actions/blog/delete.php
index 8fa1ff889..ee8621257 100644
--- a/mod/blog/actions/blog/delete.php
+++ b/mod/blog/actions/blog/delete.php
@@ -13,8 +13,10 @@ $blog_guid = get_input('guid');
 $blog = get_entity($blog_guid);
 
 if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
+	$container = get_entity($blog->container_guid);
 	if ($blog->delete()) {
 		system_message(elgg_echo('blog:message:deleted_post'));
+		forward("pg/blog/$container->username/read/");
 	} else {
 		register_error(elgg_echo('blog:error:cannot_delete_post'));
 	}
diff --git a/mod/blog/actions/blog/save.php b/mod/blog/actions/blog/save.php
index 2647e7b9a..9b1d04965 100644
--- a/mod/blog/actions/blog/save.php
+++ b/mod/blog/actions/blog/save.php
@@ -78,9 +78,9 @@ foreach ($values as $name => $default) {
 
 		case 'excerpt':
 			if ($value) {
-				$value = elgg_make_excerpt($value);
+				$value = elgg_get_excerpt($value);
 			} else {
-				$value = elgg_make_excerpt($values['description']);
+				$value = elgg_get_excerpt($values['description']);
 			}
 			$values[$name] = $value;
 			break;
-- 
cgit v1.2.3