aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-04 15:25:36 -0800
committerfriendica <info@friendica.com>2014-03-04 15:25:36 -0800
commit8340fb2a264b23e34a38ebb53e4ea8e2c92aa75f (patch)
tree122b11fb797bba9718ce4b7f4c39a984587a294a
parent39f18d0f1618ce27804d6fcf2eee15e813b17140 (diff)
parentf2f6485a4fd535160ffa0edb2dddab5567609a7e (diff)
downloadvolse-hubzilla-8340fb2a264b23e34a38ebb53e4ea8e2c92aa75f.tar.gz
volse-hubzilla-8340fb2a264b23e34a38ebb53e4ea8e2c92aa75f.tar.bz2
volse-hubzilla-8340fb2a264b23e34a38ebb53e4ea8e2c92aa75f.zip
Merge https://github.com/friendica/red into zpull
-rw-r--r--include/identity.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/identity.php b/include/identity.php
index 93174031c..05123d8dc 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1009,8 +1009,8 @@ function advanced_profile(&$a) {
function get_my_url() {
if(x($_SESSION,'zrl_override'))
return $_SESSION['zrl_override'];
- if(x($_SESSION,'my_url'))
- return $_SESSION['my_url'];
+ if(x($_SESSION,'my_address'))
+ return $_SESSION['my_address'];
return false;
}
@@ -1223,4 +1223,4 @@ function get_channel_by_nick($nick) {
);
return(($r) ? $r[0] : false);
-} \ No newline at end of file
+}