diff --git a/include/Contact.php b/include/Contact.php
index ee5ec0cfc..9fd61f8d5 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -702,15 +702,6 @@ function posts_from_gcontact(App $a, $gcontact_id) {
else
$sql = "`item`.`uid` = %d";
- if(get_config('system', 'old_pager')) {
- $r = q("SELECT COUNT(*) AS `total` FROM `item`
- WHERE `gcontact-id` = %d and $sql",
- intval($gcontact_id),
- intval(local_user()));
-
- $a->set_pager_total($r[0]['total']);
- }
-
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
`author-name` AS `name`, `owner-avatar` AS `photo`,
`owner-link` AS `url`, `owner-avatar` AS `thumb`
@@ -724,13 +715,9 @@ function posts_from_gcontact(App $a, $gcontact_id) {
intval($a->pager['itemspage'])
);
- $o = conversation($a,$r,'community',false);
+ $o = conversation($a, $r, 'community', false);
- if(!get_config('system', 'old_pager')) {
- $o .= alt_pager($a,count($r));
- } else {
- $o .= paginate($a);
- }
+ $o .= alt_pager($a, count($r));
return $o;
}
@@ -763,15 +750,6 @@ function posts_from_contact_url(App $a, $contact_url) {
$author_id = intval($r[0]["author-id"]);
- if (get_config('system', 'old_pager')) {
- $r = q("SELECT COUNT(*) AS `total` FROM `item`
- WHERE `author-id` = %d and $sql",
- intval($author_id),
- intval(local_user()));
-
- $a->set_pager_total($r[0]['total']);
- }
-
$r = q(item_query()." AND `item`.`author-id` = %d AND ".$sql.
" ORDER BY `item`.`created` DESC LIMIT %d, %d",
intval($author_id),
@@ -780,13 +758,9 @@ function posts_from_contact_url(App $a, $contact_url) {
intval($a->pager['itemspage'])
);
- $o = conversation($a,$r,'community',false);
+ $o = conversation($a, $r, 'community', false);
- if (!get_config('system', 'old_pager')) {
- $o .= alt_pager($a,count($r));
- } else {
- $o .= paginate($a);
- }
+ $o .= alt_pager($a, count($r));
return $o;
}
diff --git a/mod/admin.php b/mod/admin.php
index 0e4d6057c..e8c071113 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -660,7 +660,6 @@ function admin_page_site_post(App $a) {
$basepath = ((x($_POST,'basepath')) ? notags(trim($_POST['basepath'])) : '');
$singleuser = ((x($_POST,'singleuser')) ? notags(trim($_POST['singleuser'])) : '');
$proxy_disabled = ((x($_POST,'proxy_disabled')) ? True : False);
- $old_pager = ((x($_POST,'old_pager')) ? True : False);
$only_tag_search = ((x($_POST,'only_tag_search')) ? True : False);
$rino = ((x($_POST,'rino')) ? intval($_POST['rino']) : 0);
$embedly = ((x($_POST,'embedly')) ? notags(trim($_POST['embedly'])) : '');
@@ -811,7 +810,6 @@ function admin_page_site_post(App $a) {
set_config('system','temppath', $temppath);
set_config('system','basepath', $basepath);
set_config('system','proxy_disabled', $proxy_disabled);
- set_config('system','old_pager', $old_pager);
set_config('system','only_tag_search', $only_tag_search);
set_config('system','worker', $worker);
set_config('system','worker_queues', $worker_queues);
@@ -1055,7 +1053,6 @@ function admin_page_site(App $a) {
'$temppath' => array('temppath', t("Temp path"), get_config('system','temppath'), t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")),
'$basepath' => array('basepath', t("Base path to installation"), get_config('system','basepath'), t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.")),
'$proxy_disabled' => array('proxy_disabled', t("Disable picture proxy"), get_config('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")),
- '$old_pager' => array('old_pager', t("Enable old style pager"), get_config('system','old_pager'), t("The old style pager has page numbers but slows down massively the page speed.")),
'$only_tag_search' => array('only_tag_search', t("Only search in tags"), get_config('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),
'$relocate_url' => array('relocate_url', t("New base url"), App::get_baseurl(), t("Change base url for this server. Sends relocate message to all DFRN contacts of all users.")),
diff --git a/mod/community.php b/mod/community.php
index 7c92ff462..174330401 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -48,27 +48,6 @@ function community_content(App $a, $update = 0) {
// Only public posts can be shown
// OR your own posts if you are a logged in member
- if(get_config('system', 'old_pager')) {
- $r = qu("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
- FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- INNER JOIN `user` ON `user`.`uid` = `item`.`uid` AND `user`.`hidewall` = 0
- WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
- AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
- AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
- AND `item`.`private` = 0 AND `item`.`wall` = 1"
- );
-
- if (dbm::is_result($r))
- $a->set_pager_total($r[0]['total']);
-
- if(! $r[0]['total']) {
- info( t('No results.') . EOL);
- return $o;
- }
-
- }
-
$r = community_getitems($a->pager['start'], $a->pager['itemspage']);
if (! dbm::is_result($r)) {
@@ -105,13 +84,9 @@ function community_content(App $a, $update = 0) {
// we behave the same in message lists as the search module
- $o .= conversation($a,$s,'community',$update);
+ $o .= conversation($a, $s, 'community', $update);
- if(!get_config('system', 'old_pager')) {
- $o .= alt_pager($a,count($r));
- } else {
- $o .= paginate($a);
- }
+ $o .= alt_pager($a, count($r));
return $o;
}
diff --git a/mod/network.php b/mod/network.php
index 23cf098b6..a1181a74c 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -599,21 +599,6 @@ function network_content(App $a, $update = 0) {
$pager_sql = '';
} else {
- if(get_config('system', 'old_pager')) {
- $r = qu("SELECT COUNT(*) AS `total`
- FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = $sql_table.`contact-id`
- AND (NOT `contact`.`blocked` OR `contact`.`pending`)
- WHERE $sql_table.`uid` = %d AND $sql_table.`visible` AND NOT $sql_table.`deleted`
- $sql_extra2 $sql_extra3
- $sql_extra $sql_nets ",
- intval($_SESSION['uid'])
- );
-
- if (dbm::is_result($r)) {
- $a->set_pager_total($r[0]['total']);
- }
- }
-
// check if we serve a mobile device and get the user settings
// accordingly
if ($a->is_mobile) {
@@ -788,15 +773,13 @@ function network_content(App $a, $update = 0) {
$mode = (($nouveau) ? 'network-new' : 'network');
- $o .= conversation($a,$items,$mode,$update);
+ $o .= conversation($a, $items, $mode, $update);
if (!$update) {
- if (get_pconfig(local_user(),'system','infinite_scroll')) {
+ if (get_pconfig(local_user(), 'system', 'infinite_scroll')) {
$o .= scroll_loader();
- } elseif (!get_config('system', 'old_pager')) {
- $o .= alt_pager($a,count($items));
} else {
- $o .= paginate($a);
+ $o .= alt_pager($a, count($items));
}
}
diff --git a/mod/profile.php b/mod/profile.php
index d2864d838..fbce509d2 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -251,23 +251,6 @@ function profile_content(App $a, $update = 0) {
$sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
}
- if(get_config('system', 'old_pager')) {
- $r = q("SELECT COUNT(*) AS `total`
- FROM `thread` INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
- $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- WHERE `thread`.`uid` = %d AND `thread`.`visible` = 1 AND `thread`.`deleted` = 0
- and `thread`.`moderated` = 0
- AND `thread`.`wall` = 1
- $sql_extra3 $sql_extra $sql_extra2 ",
- intval($a->profile['profile_uid'])
- );
-
- if (dbm::is_result($r)) {
- $a->set_pager_total($r[0]['total']);
- }
- }
-
// check if we serve a mobile device and get the user settings
// accordingly
if ($a->is_mobile) {
@@ -335,14 +318,10 @@ function profile_content(App $a, $update = 0) {
);
}
- $o .= conversation($a,$items,'profile',$update);
+ $o .= conversation($a, $items, 'profile', $update);
- if(! $update) {
- if(!get_config('system', 'old_pager')) {
- $o .= alt_pager($a,count($items));
- } else {
- $o .= paginate($a);
- }
+ if (!$update) {
+ $o .= alt_pager($a, count($items));
}
return $o;
diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index dfd7a1271..e670222d4 100644
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -151,7 +151,6 @@
{{include file="field_input.tpl" field=$itemcache_duration}}
{{include file="field_input.tpl" field=$max_comments}}
{{include file="field_checkbox.tpl" field=$proxy_disabled}}
- {{include file="field_checkbox.tpl" field=$old_pager}}
{{$worker_title}}