Merge remote-tracking branch 'upstream/master'

Conflicts:
	include/acl_selectors.php

diff --cc boot.php
Simple merge

diff --cc include/acl_selectors.php
index a95c76ca3a1a1711324ad0c3b27efa6aa776a51f,886bce877387ade50d3bb9ab0c886849a8677938..72c434692c0c6087f432f56402049ba41c248b70
--- 1/include/acl_selectors.php
--- 2/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@@ -320,14 -320,7 +320,7 @@@ function populate_acl($user = null,$cel
        $o .= '</div>';
        $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,11 -331,11 +331,11 @@@
                '$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")
                ),
        ));
 -      
 -      
 +
 +
        return $o;
  
  }