Merge remote-tracking branch 'upstream/master'

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index a95c76ca3a1a1711324ad0c3b27efa6aa776a51f..72c434692c0c6087f432f56402049ba41c248b70 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -321,13 +321,6 @@ function populate_acl($user = null,$celeb = false) {
        $o .= '</div>' . "\r\n";
        $o .= '<div id="acl-wrapper-end"></div>' . "\r\n";*/
 
-       // Not totally sure what input values can come
-       // This is a hotfix to prevent massive php warnings
-       if (is_array($user) AND isset($user["uid"]))
-               $uid = $user["uid"];
-       else
-               $uid = intval($user);
-
        $tpl = get_markup_template("acl_selector.tpl");
        $o = replace_macros($tpl, array(
                '$showall'=> t("Visible to everybody"),
@@ -338,7 +331,7 @@ function populate_acl($user = null,$celeb = false) {
                '$denycid' => json_encode($perms['deny_cid']),
                '$denygid' => json_encode($perms['deny_gid']),
                '$features' => array(
-                       "aclautomention"=>(feature_enabled($uid,"aclautomention")?"true":"false")
+                       "aclautomention"=>(feature_enabled($user['uid'],"aclautomention")?"true":"false")
                ),
        ));