mexon/friendica
1
0
Fork 0
Code Pull requests Activity

pass zrl's to/through global directory

Browse source
This commit is contained in:
friendica 2012-04-14 03:51:41 -07:00
parent 7c63ca8364
commit 0d869ceb65
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
boot.php
View file

@ -1494,11 +1494,13 @@ function get_my_url() {
return false; return false;
} }
function zrl($s) { function zrl($s,$force = false) {
if(! strlen($s)) if(! strlen($s))
return $s; return $s;
if(! strpos($s,'/profile/')) if((! strpos($s,'/profile/')) && (! $force))
return $s; return $s;
if($force && substr($s,-1,1) !== '/')
$s = $s . '/';
$achar = strpos($s,'?') ? '&' : '?'; $achar = strpos($s,'?') ? '&' : '?';
$mine = get_my_url(); $mine = get_my_url();
if($mine and ! link_compare($mine,$s)) if($mine and ! link_compare($mine,$s))

2
mod/directory.php
View file

@ -44,7 +44,7 @@ function directory_content(&$a) {
$gdirpath = dirname(get_config('system','directory_submit_url')); $gdirpath = dirname(get_config('system','directory_submit_url'));
if(strlen($gdirpath)) { if(strlen($gdirpath)) {
$globaldir = '<ul><li><div id="global-directory-link"><a href="' $globaldir = '<ul><li><div id="global-directory-link"><a href="'
. $gdirpath . '">' . t('Global Directory') . '</a></div></li></ul>'; . zrl($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>';
} }
$admin = ''; $admin = '';