clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no pagination on search page

This commit is contained in:
Friendika 2010-11-24 18:37:10 -08:00
parent 48eab3e99c
commit d855371fa5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@ -1375,8 +1375,10 @@ function get_tags($s) {
$ret = array(); $ret = array();
if(preg_match_all('/([@#][^ ,:?]*)([ ,:?]|$)/',$s,$match)) { if(preg_match_all('/([@#][^ ,:?]*)([ ,:?]|$)/',$s,$match)) {
foreach($match[1] as $match) { foreach($match[1] as $match) {
if(strstr($match,"]")) if(strstr($match,"]")) {
// we might be inside a bbcode color tag - leave it alone
continue; continue;
}
if(substr($match,-1,1) === '.') if(substr($match,-1,1) === '.')
$ret[] = substr($match,0,-1); $ret[] = substr($match,0,-1);
else else

3
mod/search.php
View File

@ -117,6 +117,9 @@ function search_content(&$a) {
} }
} }
$o .= paginate($a);
return $o; return $o;
} }