harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2014-03-04 15:25:36 -08:00
commit 8340fb2a26
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/identity.php
View File

@ -1009,8 +1009,8 @@ function advanced_profile(&$a) {
function get_my_url() { function get_my_url() {
if(x($_SESSION,'zrl_override')) if(x($_SESSION,'zrl_override'))
return $_SESSION['zrl_override']; return $_SESSION['zrl_override'];
if(x($_SESSION,'my_url')) if(x($_SESSION,'my_address'))
return $_SESSION['my_url']; return $_SESSION['my_address'];
return false; return false;
} }
@ -1223,4 +1223,4 @@ function get_channel_by_nick($nick) {
); );
return(($r) ? $r[0] : false); return(($r) ? $r[0] : false);
} }