pass zrl's to/through global directory

diff --git a/boot.php b/boot.php
index 5ba3b1b4a1737d18c1ca3baf0966872d64481148..0bd201a2530327f16c72149932e9c6c7bb7bad2b 100644 (file)
--- 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 7f18bd0268257890214b3fe5b741020e83823501..367438845427d420f9139fd64ee817044ca88404 100644 (file)
--- 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 = '<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 = '';