miklo
/
friendica
sforkowany z mirror/friendica
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność

Merge pull request #539 from fermionic/20121127-universal-altpager 

universal altpager
2022.09-rc
fermionic 2012-11-28 16:40:26 -08:00
rodzic a6e7ad9771 eb964bbe08
commit eb37c8cca6
4 zmienionych plików z 33 dodań i 33 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
mod/community.php
Wyświetl plik

@ -44,7 +44,7 @@ function community_content(&$a, $update = 0) {
// Only public posts can be shown
// OR your own posts if you are a logged in member
if(! get_pconfig(local_user(),'system','alt_pager')) {
if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
$r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
@ -91,11 +91,11 @@ function community_content(&$a, $update = 0) {
$o .= conversation($a,$r,'community',$update);
if(! get_pconfig(local_user(),'system','alt_pager')) {
$o .= paginate($a);
if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
$o .= alt_pager($a,count($r));
}
else {
$o .= alt_pager($a,count($r));
$o .= paginate($a);
}
return $o;

8
mod/network.php
Wyświetl plik

@ -696,7 +696,7 @@ function network_content(&$a, $update = 0) {
}
else {
if(! get_pconfig(local_user(),'system','alt_pager')) {
if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@ -845,11 +845,11 @@ function network_content(&$a, $update = 0) {
$o .= conversation($a,$items,$mode,$update);
if(! $update) {
if(! get_pconfig(local_user(),'system','alt_pager')) {
$o .= paginate($a);
if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
$o .= alt_pager($a,count($items));
}
else {
$o .= alt_pager($a,count($items));
$o .= paginate($a);
}
}

8
mod/profile.php
Wyświetl plik

@ -242,7 +242,7 @@ function profile_content(&$a, $update = 0) {
$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
}
if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
if( (! get_config('alt_pager', 'global')) && (! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) ) {
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@ -323,11 +323,11 @@ function profile_content(&$a, $update = 0) {
$o .= conversation($a,$items,'profile',$update);
if(! $update) {
if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
$o .= paginate($a);
if( get_config('alt_pager', 'global') || get_pconfig($a->profile['profile_uid'],'system','alt_pager') ) {
$o .= alt_pager($a,count($items));
}
else {
$o .= alt_pager($a,count($items));
$o .= paginate($a);
}
}

8
mod/search.php
Wyświetl plik

@ -144,7 +144,7 @@ function search_content(&$a) {
// OR your own posts if you are a logged in member
// No items will be shown if the member has a blocked profile wall.
if(! get_pconfig(local_user(),'system','alt_pager')) {
if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
$r = q("SELECT distinct(`item`.`uri`) as `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
@ -197,11 +197,11 @@ function search_content(&$a) {
$o .= conversation($a,$r,'search',false);
if(! get_pconfig(local_user(),'system','alt_pager')) {
$o .= paginate($a);
if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
$o .= alt_pager($a,count($r));
}
else {
$o .= alt_pager($a,count($r));
$o .= paginate($a);
}
return $o;