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 9e9af19834c0b6c89429cdfeb8b73ae9bd60e964..eea5dc7e4b555bf558d7a3c77f7c10d3b05e894b 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -33,7 +33,6 @@ function profile_init(&$a) {
                auto_redir($a, $which);
        }
 
-       set_template_engine($a); // reset the template engine to the default in case the user's theme doesn't specify one
        profile_load($a,$which,$profile);
 
        $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
@@ -199,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);