diff options
| -rw-r--r-- | boot.php | 4 | ||||
| -rw-r--r-- | mod/search.php | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -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; } |