aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/network.php8
-rw-r--r--mod/profile.php11
-rw-r--r--mod/update_network.php9
-rw-r--r--mod/update_profile.php9
4 files changed, 27 insertions, 10 deletions
diff --git a/mod/network.php b/mod/network.php
index cbd1f4454..0807f9561 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 aa13f0a78..0cfe22807 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 655bebb96..18c630fdf 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 "<html>\r\n";
- echo network_content($a,true);
- echo "</html>\r\n";
+ header("Content-type: text/html");
+ echo "<!DOCTYPE html><html><body>\r\n";
+ echo (($_GET['msie'] == 1) ? '<div>' : '<section>');
+ echo str_replace("\t",' ',network_content($a,true));
+ echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
+ echo "</body></html>\r\n";
killme();
} \ No newline at end of file
diff --git a/mod/update_profile.php b/mod/update_profile.php
index a0cb10f5d..367a5568d 100644
--- a/mod/update_profile.php
+++ b/mod/update_profile.php
@@ -6,9 +6,12 @@ require_once('mod/profile.php');
function update_profile_content(&$a) {
- echo "<html>\r\n";
- echo profile_content($a,true);
- echo "</html>\r\n";
+ header("Content-type: text/html");
+ echo "<!DOCTYPE html><html><body>\r\n";
+ echo (($_GET['msie'] == 1) ? '<div>' : '<section>');
+ echo str_replace("\t",' ',profile_content($a,true));
+ echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
+ echo "</body></html>\r\n";
killme();
} \ No newline at end of file