aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2010-11-24 18:37:10 -0800
committerFriendika <info@friendika.com>2010-11-24 18:37:10 -0800
commitd855371fa5509506a85a150b3edb56277e1212e0 (patch)
tree38da93134f4e3f70490deaade390821261f19d2d
parent48eab3e99ca082614caa8fd6929d8db27e8b7d6b (diff)
downloadvolse-hubzilla-d855371fa5509506a85a150b3edb56277e1212e0.tar.gz
volse-hubzilla-d855371fa5509506a85a150b3edb56277e1212e0.tar.bz2
volse-hubzilla-d855371fa5509506a85a150b3edb56277e1212e0.zip
no pagination on search page
-rw-r--r--boot.php4
-rw-r--r--mod/search.php3
2 files changed, 6 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index adaff5f49..6d1ea165c 100644
--- a/boot.php
+++ b/boot.php
@@ -1375,8 +1375,10 @@ function get_tags($s) {
$ret = array();
if(preg_match_all('/([@#][^ ,:?]*)([ ,:?]|$)/',$s,$match)) {
foreach($match[1] as $match) {
- if(strstr($match,"]"))
+ if(strstr($match,"]")) {
+ // we might be inside a bbcode color tag - leave it alone
continue;
+ }
if(substr($match,-1,1) === '.')
$ret[] = substr($match,0,-1);
else
diff --git a/mod/search.php b/mod/search.php
index 5aa16716b..19bf6b964 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -117,6 +117,9 @@ function search_content(&$a) {
}
}
+
+ $o .= paginate($a);
+
return $o;
}