Merge pull request #8322 from nupplaphil/task/move_namespace_test

[friendica.git] / src / Module / Search / Index.php

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index a68086ecccbfac105253fbaad2381ae483f0e5e9..44407623e9704e19aea77c40f8f923792af8e633 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -137,7 +137,15 @@ class Index extends BaseSearch
                // OR your own posts if you are a logged in member
                // No items will be shown if the member has a blocked profile wall.
 
-               $pager = new Pager(DI::args()->getQueryString());
+               if (DI::mode()->isMobile()) {
+                       $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+                               DI::config()->get('system', 'itemspage_network_mobile'));
+               } else {
+                       $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+                               DI::config()->get('system', 'itemspage_network'));
+               }
+
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
 
                if ($tag) {
                        Logger::info('Start tag search.', ['q' => $search]);
@@ -200,7 +208,7 @@ class Index extends BaseSearch
 
                Logger::info('Start Conversation.', ['q' => $search]);
 
-               $o .= conversation(DI::app(), $r, $pager, 'search', false, false, 'commented', local_user());
+               $o .= conversation(DI::app(), $r, 'search', false, false, 'commented', local_user());
 
                $o .= $pager->renderMinimal(count($r));