From 3d9845f4a45f963161e31fe18d69ed31e38af003 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 12 Feb 2011 03:14:59 -0800
Subject: [PATCH] preliminary ajax comment setups

---
 mod/item.php          | 4 +++-
 mod/network.php       | 2 +-
 mod/profile.php       | 2 +-
 view/comment_item.tpl | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index a83373f59a..0d9a674f23 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -490,7 +490,9 @@ function item_post(&$a) {
 		}
 	}
 
-	goaway($a->get_baseurl() . "/" . $_POST['return'] );
+	if((x($_POST,'return')) && strlen($_POST['return']))
+		goaway($a->get_baseurl() . "/" . $_POST['return'] );
+	killme();
 	// NOTREACHED
 }
 
diff --git a/mod/network.php b/mod/network.php
index f11db45a8b..f09b302e9b 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -340,7 +340,7 @@ function network_content(&$a, $update = 0) {
 
 			if($item['last-child']) {
 				$comment = replace_macros($cmnt_tpl,array(
-					'$return_path' => $_SESSION['return_url'],
+					'$return_path' => '', // $_SESSION['return_url'],
 					'$type' => 'net-comment',
 					'$id' => $item['item_id'],
 					'$parent' => $item['parent'],
diff --git a/mod/profile.php b/mod/profile.php
index 8ec29d3827..57abc479d7 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -293,7 +293,7 @@ function profile_content(&$a, $update = 0) {
 				}
 				if($item['last-child']) {
 					$comment = replace_macros($cmnt_tpl,array(
-						'$return_path' => $_SESSION['return_url'],
+						'$return_path' => '', // $_SESSION['return_url'],
 						'$type' => 'wall-comment',
 						'$id' => $item['item_id'],
 						'$parent' => $item['parent'],
diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index 6f63e39b7a..2f1a8393fe 100644
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -18,4 +18,5 @@
 
 				<div class="comment-edit-end"></div>
 			</form>
+
 		</div>