preliminary ajax comment setups

diff --git a/mod/item.php b/mod/item.php
index a83373f59a1fa09805b7c252ac4a33a6f4a21ff1..0d9a674f23efceb6d4893e6f0b4aea5932b10a83 100644 (file)
--- 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 f11db45a8b5647c4300df48caeb2ca71313ccf0d..f09b302e9bbdece1fbc10807856a38aafdcfed0d 100644 (file)
--- 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 8ec29d38279aec6be0c1423fb3eb5965c1c69c00..57abc479d72fd344fd1e1692473a952dea67bf5b 100644 (file)
--- 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 6f63e39b7aa7bf324dc86182ca67ac08776c909d..2f1a8393fece8e4ff752f92b4e9fbc5cc3632f1e 100644 (file)
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -18,4 +18,5 @@
 
                                <div class="comment-edit-end"></div>
                        </form>
+
                </div>