use local 'match people with my interests' if global directory is not configured

diff --git a/mod/contacts.php b/mod/contacts.php
index 444e6dec4c018b0732260d73c077fb0cab3ee75f..7a97b53d230a33e02647dc836c923534f9b513c2 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -11,8 +11,9 @@ function contacts_init(&$a) {
        if($a->config['register_policy'] != REGISTER_CLOSED)
                $a->page['aside'] .= '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
 
-       if(strlen(get_config('system','directory_submit_url')))
-               $a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >' . t('Find People With Shared Interests') . '</a></div>';
+
+       $a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >' 
+               . t('Find People With Shared Interests') . '</a></div>';
 
        $tpl = get_markup_template('follow.tpl');
        $a->page['aside'] .= replace_macros($tpl,array(

diff --git a/mod/match.php b/mod/match.php
index 2d6456b54b01c6d591d25904c44dbf86e343b8ec..4316d8bd70f4aad904376c46b622a1dd4729e44b 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -15,7 +15,7 @@ function match_content(&$a) {
        if(! count($r))
                return; 
        if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
-               notice('No keywords to match. Please add keywords to your default profile.');
+               notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
                return;
 
        }
@@ -27,7 +27,10 @@ function match_content(&$a) {
                if($a->pager['page'] != 1)
                        $params['p'] = $a->pager['page'];
                        
-               $x = post_url('http://dir.friendika.com/msearch', $params);
+               if(strlen(get_config('system','directory_submit_url')))
+                       $x = post_url('http://dir.friendika.com/msearch', $params);
+               else
+                       $x = post_url($a->get_baseurl() . '/msearch', $params);
 
                $j = json_decode($x);