X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Facl_selectors.php;h=6f08523ca97dffded9ea03eb61229859667e9e45;hb=0cd9db9cb7f4c96f597e37590a536eaae123238d;hp=9ef1977bc5fd68d83f025383f4a52331451e19fe;hpb=d5cc757943fd56cbd4c1f89484dc499747d7e887;p=friendica.git

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 9ef1977bc5..6f08523ca9 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -209,7 +209,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	$tabindex = ($tabindex > 0 ? "tabindex=\"$tabindex\"" : "");
 
-	if ($privmail AND $preselected) {
+	if ($privmail && $preselected) {
 		$sql_extra .= " AND `id` IN (".implode(",", $preselected).")";
 		$hidepreselected = ' style="display: none;"';
 	} else {
@@ -261,7 +261,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	$o .= "</select>\r\n";
 
-	if ($privmail AND $preselected) {
+	if ($privmail && $preselected) {
 		$o .= implode(", ", $receiverlist);
 	}
 
@@ -388,13 +388,9 @@ function populate_acl($user = null, $show_jotnets = false) {
 }
 
 function construct_acl_data(App $a, $user) {
-
-	$arr = array('user' => $user);
-	call_hooks('construct_acl_data', $arr);
-
-	if (isset($arr['cancel'])) {
-		return;
-	}
+	// This function is now deactivated. It seems as if the generated data isn't used anywhere.
+	/// @todo Remove this function and all function calls before releasing Friendica 3.5.3
+	return;
 
 	// Get group and contact information for html ACL selector
 	$acl_data = acl_lookup($a, 'html');