diff --git a/mod/network.php b/mod/network.php index cbd1f44545..0807f95614 100644 --- a/mod/network.php +++ b/mod/network.php @@ -119,9 +119,15 @@ function network_content(&$a, $update = false) { } } + if($update) + $return_url = $_SESSION['return_url']; + else + $return_url = $_SESSION['return_url'] = $a->cmd; + + if($item['last-child']) { $comment = replace_macros($cmnt_tpl,array( - '$return_path' => $a->cmd, + '$return_path' => $_SESSION['return_url'], '$id' => $item['item_id'], '$parent' => $item['parent'], '$profile_uid' => $_SESSION['uid'], diff --git a/mod/profile.php b/mod/profile.php index aa13f0a78d..0cfe228072 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -212,13 +212,18 @@ function profile_content(&$a, $update = false) { $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ; - if(can_write_wall($a,$a->profile['profile_uid'])) { + if($update) + $return_url = $_SESSION['return_url']; + else + $return_url = $_SESSION['return_url'] = $a->cmd; + + if(can_write_wall($a,$a->profile['uid'])) { if($item['last-child']) { $comment = replace_macros($cmnt_tpl,array( - '$return_path' => $a->cmd, + '$return_path' => $_SESSION['return_url'], '$id' => $item['item_id'], '$parent' => $item['parent'], - '$profile_uid' => $a->profile['profile_uid'], + '$profile_uid' => $a->profile['uid'], '$ww' => '' )); } diff --git a/mod/update_network.php b/mod/update_network.php index 655bebb965..18c630fdf0 100644 --- a/mod/update_network.php +++ b/mod/update_network.php @@ -6,9 +6,12 @@ require_once('mod/network.php'); function update_network_content(&$a) { - echo "\r\n"; - echo network_content($a,true); - echo "\r\n"; + header("Content-type: text/html"); + echo "
\r\n"; + echo (($_GET['msie'] == 1) ? '