X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPermissionSet.php;h=c9a0697ebc9800ee3a42eadfed7e0648174dc542;hb=146646c4d43f49e723b830b9ffb0208bad3431a3;hp=c9b2b17b67223b0608d0a3fe8eb89b430d5111c3;hpb=1ddd2df4b89f397657cfe38b1154086d900cffa5;p=friendica.git

diff --git a/src/Model/PermissionSet.php b/src/Model/PermissionSet.php
index c9b2b17b67..c9a0697ebc 100644
--- a/src/Model/PermissionSet.php
+++ b/src/Model/PermissionSet.php
@@ -22,10 +22,10 @@ class PermissionSet extends BaseObject
 	public static function fetchIDForPost(&$postarray)
 	{
 		$condition = ['uid' => $postarray['uid'],
-			'allow_cid' => self::sortPermissions(defaults($postarray, 'allow_cid', '')),
-			'allow_gid' => self::sortPermissions(defaults($postarray, 'allow_gid', '')),
-			'deny_cid' => self::sortPermissions(defaults($postarray, 'deny_cid', '')),
-			'deny_gid' => self::sortPermissions(defaults($postarray, 'deny_gid', ''))];
+			'allow_cid' => self::sortPermissions($postarray['allow_cid'] ?? ''),
+			'allow_gid' => self::sortPermissions($postarray['allow_gid'] ?? ''),
+			'deny_cid'  => self::sortPermissions($postarray['deny_cid']  ?? ''),
+			'deny_gid'  => self::sortPermissions($postarray['deny_gid']  ?? '')];
 
 		$set = DBA::selectFirst('permissionset', ['id'], $condition);
 
@@ -89,11 +89,9 @@ class PermissionSet extends BaseObject
 
 		$contact_str = '<' . $contact_id . '>';
 
-		$condition = ["`uid` = ? AND (`allow_cid` = '' OR`allow_cid` REGEXP ?)
-			AND (`deny_cid` = '' OR NOT `deny_cid` REGEXP ?)
-			AND (`allow_gid` = '' OR `allow_gid` REGEXP ?)
-			AND (`deny_gid` = '' OR NOT `deny_gid` REGEXP ?)",
-			$uid, $contact_str, $contact_str, $group_str, $group_str];
+		$condition = ["`uid` = ? AND (NOT (`deny_cid` REGEXP ? OR deny_gid REGEXP ?)
+			AND (allow_cid REGEXP ? OR allow_gid REGEXP ? OR (allow_cid = '' AND allow_gid = '')))",
+			$uid, $contact_str, $group_str, $contact_str, $group_str];
 
 		$ret = DBA::select('permissionset', ['id'], $condition);
 		$set = [];