no pagination on search page

diff --git a/boot.php b/boot.php
index adaff5f49a0af51200f7e3bf9f20b61602962de6..6d1ea165cb40791ee41a3e88b5b2354705cae950 100644 (file)
--- 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 5aa16716b5e646580aa53a1f6d7d8e9b88c7dd5e..19bf6b964f6a605bff86287a57b7141f085a855e 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -117,6 +117,9 @@ function search_content(&$a) {
 
                }
        }
+
+       $o .= paginate($a);
+
        return $o;
 }