aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-06-17 19:25:46 -0700
committerfriendica <info@friendica.com>2013-06-17 19:25:46 -0700
commitc5e38598280209903fc60c9ce996e7f3c34a4533 (patch)
treef6fd0e81b0237111d4a4eafd3085181a451af50e
parent49802d9a47d1f492715193092f61c60f43dd7723 (diff)
downloadvolse-hubzilla-c5e38598280209903fc60c9ce996e7f3c34a4533.tar.gz
volse-hubzilla-c5e38598280209903fc60c9ce996e7f3c34a4533.tar.bz2
volse-hubzilla-c5e38598280209903fc60c9ce996e7f3c34a4533.zip
another try on zidified notifications - this time it actually seems to work
-rwxr-xr-xboot.php2
-rw-r--r--include/enotify.php4
2 files changed, 5 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 2f70f1d47..fc02f28e9 100755
--- a/boot.php
+++ b/boot.php
@@ -2055,6 +2055,8 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
function get_my_url() {
+ if(x($_SESSION,'zrl_override'))
+ return $_SESSION['zrl_override'];
if(x($_SESSION,'my_url'))
return $_SESSION['my_url'];
return false;
diff --git a/include/enotify.php b/include/enotify.php
index 11f594d6c..71629b9d9 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -363,13 +363,15 @@ function notification($params) {
// the recipient address instead of the current observer
$_SESSION['zid_override'] = $recip['channel_address'] . '@' . get_app()->get_hostname();
-
+ $_SESSION['zrl_override'] = z_root() . '/channel/' . $recip['channel_address'];
+
$textversion = zidify_links($textversion);
$htmlversion = zidify_links($htmlversion);
// unset when done to revert to normal behaviour
unset($_SESSION['zid_override']);
+ unset($_SESSION['zrl_override']);
$datarray = array();