From 2c9ea2cd34a1dd782e165b163899d7ba1ec1f41c Mon Sep 17 00:00:00 2001
From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 9 Mar 2010 18:17:16 +0000
Subject: Blogs updated to new UI (needs Brett to look over first)

git-svn-id: http://code.elgg.org/elgg/trunk@5335 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/blog/actions/delete.php | 70 +++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 38 deletions(-)

(limited to 'mod/blog/actions/delete.php')

diff --git a/mod/blog/actions/delete.php b/mod/blog/actions/delete.php
index c01ca3844..5b0120cef 100644
--- a/mod/blog/actions/delete.php
+++ b/mod/blog/actions/delete.php
@@ -1,38 +1,32 @@
-<?php
-
-	/**
-	 * Elgg blog: delete post action
-	 * 
-	 * @package ElggBlog
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.org/
-	 */
-
-	// Make sure we're logged in (send us to the front page if not)
-		gatekeeper();
-
-	// Get input data
-		$guid = (int) get_input('blogpost');
-		
-	// Make sure we actually have permission to edit
-		$blog = get_entity($guid);
-		if ($blog->getSubtype() == "blog" && $blog->canEdit()) {
-	
-		// Get owning user
-				$owner = get_entity($blog->getOwner());
-		// Delete it!
-				$rowsaffected = $blog->delete();
-				if ($rowsaffected > 0) {
-		// Success message
-					system_message(elgg_echo("blog:deleted"));
-				} else {
-					register_error(elgg_echo("blog:notdeleted"));
-				}
-		// Forward to the main blog page
-				forward("mod/blog/?username=" . $owner->username);
-		
-		}
-		
-?>
\ No newline at end of file
+<?php
+
+/**
+ * Elgg blog: delete post action
+ */
+
+// Make sure we're logged in (send us to the front page if not)
+gatekeeper();
+
+// Get input data
+$guid = (int) get_input('blogpost');
+		
+// Make sure we actually have permission to edit
+$blog = get_entity($guid);
+if ($blog->getSubtype() == "blog" && $blog->canEdit()) {
+	$container = get_entity($blog->container_guid);
+	
+	// Get owning user
+	$owner = get_entity($blog->getOwner());
+	// Delete it!
+	$rowsaffected = $blog->delete();
+	if ($rowsaffected > 0) {
+	// Success message
+			system_message(elgg_echo("blog:deleted"));
+	} else {
+			register_error(elgg_echo("blog:notdeleted"));
+	}
+	// Forward to the main blog page
+	forward("pg/blog/" . $container->username);
+}else{
+	forward($_SERVER['HTTP_REFERER']);
+}
\ No newline at end of file
-- 
cgit v1.2.3