diff options
| author | Chris Case <kahotep@bunda.dreamhost.com> | 2011-02-14 11:50:08 -0800 |
|---|---|---|
| committer | Chris Case <kahotep@bunda.dreamhost.com> | 2011-02-14 11:50:08 -0800 |
| commit | 7b265005107f12fa1e5768853e280a8f0b68eeac (patch) | |
| tree | 8d178994704419c8f9b93289913af92a61caa2e8 /mod | |
| parent | 42eb6dd723abd31aaaf6c1608f2dec645f4e20b5 (diff) | |
| parent | fe1a37074af43f17aac5859b1aaf37fde4b58ae9 (diff) | |
| download | volse-hubzilla-7b265005107f12fa1e5768853e280a8f0b68eeac.tar.gz volse-hubzilla-7b265005107f12fa1e5768853e280a8f0b68eeac.tar.bz2 volse-hubzilla-7b265005107f12fa1e5768853e280a8f0b68eeac.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/item.php | 7 | ||||
| -rw-r--r-- | mod/network.php | 2 | ||||
| -rw-r--r-- | mod/profile.php | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/mod/item.php b/mod/item.php index a83373f59..2cc2b9eb2 100644 --- a/mod/item.php +++ b/mod/item.php @@ -490,7 +490,12 @@ function item_post(&$a) { } } - goaway($a->get_baseurl() . "/" . $_POST['return'] ); + if((x($_POST,'return')) && strlen($_POST['return'])) + goaway($a->get_baseurl() . "/" . $_POST['return'] ); + + $json = array('success' => 1); + echo json_encode($json); + killme(); // NOTREACHED } diff --git a/mod/network.php b/mod/network.php index f11db45a8..f09b302e9 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 8ec29d382..57abc479d 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'], |