From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 12 Dec 2018 07:12:34 +0000 (+0100)
Subject: Remove resourceid parameter from Photo::exists()
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=55292c954b93054bcf4551c560958580151fed03;p=friendica.git

Remove resourceid parameter from Photo::exists()
---

diff --git a/include/api.php b/include/api.php
index 5a2248e6e7..9c18441103 100644
--- a/include/api.php
+++ b/include/api.php
@@ -3995,7 +3995,7 @@ function api_fr_photoalbum_update($type)
 		throw new BadRequestException("no new albumname specified");
 	}
 	// check if album is existing
-	if (!Photo::exists(null, ['uid' => api_user(), 'album' => $album])) {
+	if (!Photo::exists(['uid' => api_user(), 'album' => $album])) {
 		throw new BadRequestException("album not available");
 	}
 	// now let's update all photos to the albumname
@@ -4100,7 +4100,7 @@ function api_fr_photo_create_update($type)
 		$mode = "update";
 
 		// check if photo is existing in databasei
-		if (!Photo::exists($photo_id, ['uid' => api_user(), 'album' => $album])) {
+		if (!Photo::exists(['resource-id' => $photo_id, 'uid' => api_user(), 'album' => $album])) {
 			throw new BadRequestException("photo not available");
 		}
 	}
@@ -4211,7 +4211,7 @@ function api_fr_photo_delete($type)
 		throw new BadRequestException("no photo_id specified");
 	}
 	// check if photo is existing in database
-	$r = Photo::exists($photo_id, ['uid' => api_user()]);
+	$r = Photo::exists(['resource-id' => $photo_id, 'uid' => api_user()]);
 	if (!$r) {
 		throw new BadRequestException("photo not available");
 	}
diff --git a/mod/item.php b/mod/item.php
index cc9de0dd60..62b088a04f 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -459,9 +459,9 @@ function item_post(App $a) {
 
 				$condition = [
 					'allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
-					'uid' => $profile_uid
+					'resource-id' => $image_uri, 'uid' => $profile_uid
 				];
-				if (!Photo::exists($image_uri, $condition)) {
+				if (!Photo::exists($condition)) {
 					continue;
 				}
 
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 1b30879456..7eb7bb26ac 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -147,20 +147,12 @@ class Photo extends BaseObject
 	/**
 	 * @brief Check if photo with given resource id exists
 	 *
-	 * @param string  $resourceid  Resource ID of the photo
 	 * @param array   $conditions  Array of extra conditions. Optional
 	 *
 	 * @return boolean
 	 */
-	public static function exists($resourceid, array $conditions = [])
+	public static function exists(array $conditions = [])
 	{
-		if (!is_null($resourceid)) {
-			$conditions["resource-id"] = $resourceid;
-		}
-		if (count($conditions) == 0) {
-			// no conditions defined. return false
-			return false;
-		}
 		return DBA::count("photo", $conditions) > 0;
 	}