From: Michael Vogel <icarus@dabo.de>
Date: Mon, 13 Jan 2014 18:59:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=17236b18011f6c2fa7df7d1433dd815d4438baf8;p=friendica.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	include/acl_selectors.php
---

17236b18011f6c2fa7df7d1433dd815d4438baf8
diff --cc include/acl_selectors.php
index a95c76ca3a,886bce8773..72c434692c
--- a/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;
  
  }