oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-12 01:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	include/acl_selectors.php
This commit is contained in:
Michael Vogel 2014-01-13 19:59:34 +01:00
commit 17236b1801
13 changed files with 16114 additions and 15536 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/acl_selectors.php
View file

@ -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")
),
));