aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-23 00:17:55 -0800
committerfriendica <info@friendica.com>2013-11-23 00:17:55 -0800
commita7536b117fe11a7c2ed955d3281ab719ef638a92 (patch)
tree780e656c92022e0efad571b5d98bec1bb16fbe11 /mod
parentc81eb2a7952dac232e344d769f120120fa80bae1 (diff)
parent7f6f4d2e9e5ff0486382c41c76f6eac87af37ef2 (diff)
downloadvolse-hubzilla-a7536b117fe11a7c2ed955d3281ab719ef638a92.tar.gz
volse-hubzilla-a7536b117fe11a7c2ed955d3281ab719ef638a92.tar.bz2
volse-hubzilla-a7536b117fe11a7c2ed955d3281ab719ef638a92.zip
Merge pull request #207 from git-marijus/master
search should respect max items to load as well
Diffstat (limited to 'mod')
-rw-r--r--mod/search.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/mod/search.php b/mod/search.php
index 539241268..bad071936 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -186,6 +186,8 @@ function search_content(&$a,$update = 0, $load = false) {
$pub_sql = public_permissions_sql(get_observer_hash());
if(($update) && ($load)) {
+ $itemspage = get_pconfig(local_user(),'system','itemspage');
+ $a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
if($load) {