X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPhoto.php;h=a1e2e378bec4372eb72bfa2db37eef65311852ea;hb=15b0a7a4d8d32c76fc64947f7178125707419ea5;hp=4942381a4c15fbd2a434750d0d2dbd27d4e6dd17;hpb=6a0ed7c298669ef0b0f33563df15bb2a3c7207b0;p=friendica.git

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 4942381a4c..a1e2e378be 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -138,32 +138,31 @@ class Photo extends BaseObject
 		$params = ["order" => ["scale" => true]];
 
 		$photo = self::selectFirst([], $conditions, $params);
-		if ($photo === false) {
-			return self::createPhotoForSystemResource("images/nosign.jpg");
-		}
+
 		return $photo;
 	}
 
 	/**
-	 * @brief Check if photo with given resource id exists
+	 * @brief Check if photo with given conditions exists
 	 *
-	 * @param string  $resourceid  Resource ID of the photo
+	 * @param array   $conditions  Array of extra conditions
 	 *
 	 * @return boolean
 	 */
-	public static function exists($resourceid)
+	public static function exists(array $conditions)
 	{
-		return DBA::count("photo", ["resource-id" => $resourceid]) > 0;
+		return DBA::exists("photo", $conditions);
 	}
 
+
 	/**
 	 * @brief Get Image object for given row id. null if row id does not exist
 	 *
-	 * @param integer  $id  Row id
+	 * @param array  $photo  Photo data. Needs at least 'id', 'type', 'backend-class', 'backend-ref'
 	 *
 	 * @return \Friendica\Object\Image
 	 */
-	public static function getImageForPhoto($photo)
+	public static function getImageForPhoto(array $photo)
 	{
 		$data = "";
 		if ($photo["backend-class"] == "") {
@@ -307,11 +306,22 @@ class Photo extends BaseObject
 		return $r;
 	}
 
-	public static function delete(array $conditions, $options = [])
+
+	/**
+	 * @brief Delete info from table and data from storage
+	 *
+	 * @param array  $conditions  Field condition(s)
+	 * @param array  $options     Options array, Optional
+	 *
+	 * @return boolean
+	 *
+	 * @see \Friendica\Database\DBA::delete
+	 */
+	public static function delete(array $conditions, array $options = [])
 	{
 		// get photo to delete data info
 		$photos = self::select(["backend-class","backend-ref"], $conditions);
-		
+
 		foreach($photos as $photo) {
 			$backend_class = (string)$photo["backend-class"];
 			if ($backend_class !== "") {
@@ -348,11 +358,12 @@ class Photo extends BaseObject
 					$fields["data"] = $img->asString();
 				}
 			}
+			$fields['updated'] = DateTimeFormat::utcNow();
 		}
 
-		$fields['updated'] = DateTimeFormat::utcNow();
+		$fields['edited'] = DateTimeFormat::utcNow();
 
-		return DBA::update("photo", $fields, $conditions);
+		return DBA::update("photo", $fields, $conditions, $old_fields);
 	}
 
 	/**