aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-07-02 01:21:56 -0700
committerFriendika <info@friendika.com>2011-07-02 01:21:56 -0700
commite6aaa8b59b138f4195fb7f1e93b9b14980c309c3 (patch)
tree4ff360ada50661e7c6c95f65b90ea1599c7f5807
parentfb0e758ce79c5c6a70d41766e3581bf756881d03 (diff)
downloadvolse-hubzilla-e6aaa8b59b138f4195fb7f1e93b9b14980c309c3.tar.gz
volse-hubzilla-e6aaa8b59b138f4195fb7f1e93b9b14980c309c3.tar.bz2
volse-hubzilla-e6aaa8b59b138f4195fb7f1e93b9b14980c309c3.zip
use local 'match people with my interests' if global directory is not configured
-rw-r--r--mod/contacts.php5
-rw-r--r--mod/match.php7
2 files changed, 8 insertions, 4 deletions
diff --git a/mod/contacts.php b/mod/contacts.php
index 444e6dec4..7a97b53d2 100644
--- 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 2d6456b54..4316d8bd7 100644
--- 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);