Merge pull request #603 from fermionic/20130204-info-message-shown-on-redir

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 2ab5b6de35b17f0b57b5c4f4de1894b3e789b67a..b5046b632746e7e84b375eadb3ce2f0e766a8623 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -560,10 +560,12 @@ function network_content(&$a, $update = 0) {
                        'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
                        'lockstate' => ((($group) || ($cid) || ($nets) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+                       'default_perms' => get_acl_permissions($a->user),
                        'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
                        'bang' => (($group || $cid || $nets) ? '!' : ''),
                        'visitor' => 'block',
-                       'profile_uid' => local_user()
+                       'profile_uid' => local_user(),
+                       'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
                );
 
                $o .= status_editor($a,$x);
@@ -696,7 +698,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 +847,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);
                }
        }