Frost-mobile: media query in css for tablets

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index b142943c1e9121f2fb80a769d7c2f9cb0d7877f3..a3e25b76a119324c1fd5e18b379cab4f83035861 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -206,7 +206,6 @@ function profile_content(&$a, $update = 0) {
                        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                        WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
                        (`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE ."' OR item.verb = '" . ACTIVITY_DISLIKE . "')
-                       WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
                        and `item`.`moderated` = 0 and `item`.`unseen` = 1
                        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                        AND `item`.`wall` = 1
@@ -229,20 +228,21 @@ function profile_content(&$a, $update = 0) {
                        $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
                }
 
-
-               $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
-                       and `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
-                       AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
-                       $sql_extra $sql_extra2 ",
-                       intval($a->profile['profile_uid'])
-               );
-
-               if(count($r)) {
-                       $a->set_pager_total($r[0]['total']);
-                       $a->set_pager_itemspage(40);
+                if(! 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
+                               and `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
+                               AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
+                               $sql_extra $sql_extra2 ",
+                               intval($a->profile['profile_uid'])
+                       );
+
+                       if(count($r)) {
+                               $a->set_pager_total($r[0]['total']);
+               }
                }
+               $a->set_pager_itemspage(40);
 
                $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
 
@@ -313,7 +313,12 @@ function profile_content(&$a, $update = 0) {
        $o .= conversation($a,$items,'profile',$update);
 
        if(! $update) {
-               $o .= paginate($a);
+         if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
+                       $o .= paginate($a);
+               }
+               else {
+                       $o .= alt_pager($a,count($items));
+               }
        }
 
        return $o;