From 0d869ceb65badbd4d80dd0d5cf2d631bca7f5b9e Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 14 Apr 2012 03:51:41 -0700 Subject: [PATCH] pass zrl's to/through global directory --- boot.php | 6 ++++-- mod/directory.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 5ba3b1b4a1..0bd201a253 100644 --- a/boot.php +++ b/boot.php @@ -1494,11 +1494,13 @@ function get_my_url() { return false; } -function zrl($s) { +function zrl($s,$force = false) { if(! strlen($s)) return $s; - if(! strpos($s,'/profile/')) + if((! strpos($s,'/profile/')) && (! $force)) return $s; + if($force && substr($s,-1,1) !== '/') + $s = $s . '/'; $achar = strpos($s,'?') ? '&' : '?'; $mine = get_my_url(); if($mine and ! link_compare($mine,$s)) diff --git a/mod/directory.php b/mod/directory.php index 7f18bd0268..3674388454 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -44,7 +44,7 @@ function directory_content(&$a) { $gdirpath = dirname(get_config('system','directory_submit_url')); if(strlen($gdirpath)) { $globaldir = ''; + . zrl($gdirpath,true) . '">' . t('Global Directory') . ''; } $admin = '';