aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-10-03 14:47:18 -0700
committerFriendika <info@friendika.com>2011-10-03 14:47:18 -0700
commitdfd5cc57c2134067dc6229b8583b5e808f160004 (patch)
treea6ec4019f0d269a7020d7f1c6305045d1978bb14
parentc6ac4387350eefce8ba68485c49ba8da60ff437b (diff)
downloadvolse-hubzilla-dfd5cc57c2134067dc6229b8583b5e808f160004.tar.gz
volse-hubzilla-dfd5cc57c2134067dc6229b8583b5e808f160004.tar.bz2
volse-hubzilla-dfd5cc57c2134067dc6229b8583b5e808f160004.zip
tagmatch available to anon, add paging variable to query
-rw-r--r--boot.php2
-rw-r--r--mod/tagmatch.php18
2 files changed, 9 insertions, 11 deletions
diff --git a/boot.php b/boot.php
index 471231820..770667177 100644
--- a/boot.php
+++ b/boot.php
@@ -8,7 +8,7 @@ require_once("include/pgettext.php");
require_once('include/nav.php');
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
-define ( 'FRIENDIKA_VERSION', '2.3.1122' );
+define ( 'FRIENDIKA_VERSION', '2.3.1123' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1094 );
diff --git a/mod/tagmatch.php b/mod/tagmatch.php
index b2313694b..8023fa433 100644
--- a/mod/tagmatch.php
+++ b/mod/tagmatch.php
@@ -3,24 +3,22 @@
function tagmatch_content(&$a) {
- $search = $_REQUEST['search'];
+ $search = notags(trim($_REQUEST['search']));
$o = '';
- if(! local_user())
- return;
-
- $o .= '<h2>' . t('Tag Match') . ' - ' . notags($search) . '</h2>';
+ $o .= '<h2>' . t('Tag Match') . ' - ' . $search . '</h2>';
if($search) {
- $params['s'] = $search;
- if($a->pager['page'] != 1)
- $params['p'] = $a->pager['page'];
+
+ $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
if(strlen(get_config('system','directory_submit_url')))
- $x = fetch_url('http://dir.friendika.com/lsearch?f=&search=' . urlencode($search));
+ $x = fetch_url('http://dir.friendika.com/lsearch?f=' . $p . '&search=' . urlencode($search));
+
+//TODO fallback local search if global dir not available.
// else
-// $x = post_url($a->get_baseurl() . '/msearch', $params);
+// $x = post_url($a->get_baseurl() . '/lsearch', $params);
$j = json_decode($x);