Merge pull request #607 from fermionic/20130204-attach-types-are-too-coarse

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index abeb735fe86e5e973c09fa2f19140fed286804fa..eea5dc7e4b555bf558d7a3c77f7c10d3b05e894b 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -198,7 +198,8 @@ function profile_content(&$a, $update = 0) {
                'acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''),
                    'bang' => '',
                'visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'),
-                   'profile_uid' => $a->profile['profile_uid']
+                   'profile_uid' => $a->profile['profile_uid'],
+                               'acl_data' => ( $is_owner ? construct_acl_data($a, $a->user) : '' ), // For non-Javascript ACL selector
                );
 
                $o .= status_editor($a,$x);
@@ -324,10 +325,10 @@ function profile_content(&$a, $update = 0) {
 
        if(! $update) {
                if( get_config('alt_pager', 'global') || get_pconfig($a->profile['profile_uid'],'system','alt_pager') ) {
-                       $o .= paginate($a);
+                       $o .= alt_pager($a,count($items));
                }
                else {
-                       $o .= alt_pager($a,count($items));
+                       $o .= paginate($a);
                }
        }