X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPermissionSet.php;h=3148d4da03360330f7127b729e7a56f98788838d;hb=08da1ed038c9b193ded0ca70b3b1c1085bb7e90a;hp=20848c04d3b2ea6fdc56d9babc67f62e79a9728b;hpb=986106a8f7d0b58a2b2834b082301a426bc98999;p=friendica.git

diff --git a/src/Model/PermissionSet.php b/src/Model/PermissionSet.php
index 20848c04d3..3148d4da03 100644
--- a/src/Model/PermissionSet.php
+++ b/src/Model/PermissionSet.php
@@ -7,8 +7,6 @@ namespace Friendica\Model;
 use Friendica\BaseObject;
 use Friendica\Database\DBA;
 
-require_once 'include/dba.php';
-
 /**
  * @brief functions for interacting with the permission set of an object (item, photo, event, ...)
  */
@@ -18,15 +16,11 @@ class PermissionSet extends BaseObject
 	 * Fetch the id of a given permission set. Generate a new one when needed
 	 *
 	 * @param array $postarray The array from an item, picture or event post
-	 * @return id
+	 * @return int id
+	 * @throws \Exception
 	 */
 	public static function fetchIDForPost(&$postarray)
 	{
-		if (is_null($postarray['allow_cid']) || is_null($postarray['allow_gid'])
-			|| is_null($postarray['deny_cid']) || is_null($postarray['deny_gid'])) {
-			return null;
-		}
-
 		$condition = ['uid' => $postarray['uid'],
 			'allow_cid' => self::sortPermissions(defaults($postarray, 'allow_cid', '')),
 			'allow_gid' => self::sortPermissions(defaults($postarray, 'allow_gid', '')),
@@ -41,7 +35,6 @@ class PermissionSet extends BaseObject
 			$set = DBA::selectFirst('permissionset', ['id'], $condition);
 		}
 
-
 		$postarray['allow_cid'] = null;
 		$postarray['allow_gid'] = null;
 		$postarray['deny_cid'] = null;
@@ -77,6 +70,7 @@ class PermissionSet extends BaseObject
 	 * @param array   $groups     Possibly previously fetched group ids for that contact
 	 *
 	 * @return array of permission set ids.
+	 * @throws \Exception
 	 */
 
 	static public function get($uid, $contact_id, $groups = null)
@@ -108,7 +102,6 @@ class PermissionSet extends BaseObject
 			$set[] = $permission['id'];
 		}
 		DBA::close($ret);
-		logger('Blubb: '.$uid.' - '.$contact_id.': '.implode(', ', $set));
 
 		return $set;
 	}