New option to enable and disable the "share" element

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 6a80909e736c19df277cb435e0fc31f087866f5c..25871c24059d3c77cf3dd0062eeed152014dd668 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -12,7 +12,7 @@ function profile_init(&$a) {
        if($a->argc > 1)
                $which = $a->argv[1];
        else {
-               $r = q("select nickname from user where blocked = 0 and account_expired = 0 and verified = 1 order by rand() limit 1");
+               $r = q("select nickname from user where blocked = 0 and account_expired = 0 and account_removed = 0 and verified = 1 order by rand() limit 1");
                if(count($r)) {
                        goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']);
                }
@@ -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,12 +323,12 @@ 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);
-               }
-               else {
-                       $o .= alt_pager($a,count($items));
-               }
+               if( get_config('alt_pager', 'global') || get_pconfig($a->profile['profile_uid'],'system','alt_pager') ) {
+                       $o .= alt_pager($a,count($items));
+               }
+               else {
+                       $o .= paginate($a);
+               }
        }
 
        return $o;