X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=e06df925e34ee9530c0c2f51d8c614175b00433b;hb=e0ecbd0b95454ed2ff4b0082b41d388d2938e3ae;hp=c54869c3e51c310143f86d908969bef2bc15bb08;hpb=b02cdc8a7f84a4931e80027de42a80daa58581e1;p=friendica.git

diff --git a/include/items.php b/include/items.php
index c54869c3e5..e06df925e3 100644
--- a/include/items.php
+++ b/include/items.php
@@ -33,6 +33,8 @@ function add_page_info_data($data, $no_photos = false) {
 		$data["type"] = "link";
 	}
 
+	$data["title"] = defaults($data, "title", "");
+
 	if ((($data["type"] != "link") && ($data["type"] != "video") && ($data["type"] != "photo")) || ($data["title"] == $data["url"])) {
 		return "";
 	}
@@ -47,19 +49,19 @@ function add_page_info_data($data, $no_photos = false) {
 
 	$text = "[attachment type='".$data["type"]."'";
 
-	if ($data["text"] == "") {
+	if (empty($data["text"])) {
 		$data["text"] = $data["title"];
 	}
 
-	if ($data["text"] == "") {
+	if (empty($data["text"])) {
 		$data["text"] = $data["url"];
 	}
 
-	if ($data["url"] != "") {
+	if (!empty($data["url"])) {
 		$text .= " url='".$data["url"]."'";
 	}
 
-	if ($data["title"] != "") {
+	if (!empty($data["title"])) {
 		$text .= " title='".$data["title"]."'";
 	}
 
@@ -335,17 +337,14 @@ function drop_item($id) {
 
 	// locate item to be deleted
 
-	$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
-		intval($id)
-	);
+	$fields = ['id', 'uid', 'contact-id', 'deleted'];
+	$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]);
 
-	if (!DBM::is_result($r)) {
+	if (!DBM::is_result($item)) {
 		notice(L10n::t('Item not found.') . EOL);
 		goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
 	}
 
-	$item = $r[0];
-
 	if ($item['deleted']) {
 		return 0;
 	}
@@ -364,7 +363,6 @@ function drop_item($id) {
 	}
 
 	if ((local_user() == $item['uid']) || $contact_id) {
-
 		// Check if we should do HTML-based delete confirmation
 		if ($_REQUEST['confirm']) {
 			// <form> can't take arguments in its "action" parameter
@@ -431,9 +429,11 @@ function list_post_dates($uid, $wall) {
 		$start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
 		$end_month = DateTimeFormat::utc($dend, 'Y-m-d');
 		$str = day_translate(DateTimeFormat::utc($dnow, 'F'));
-		if (!$ret[$dyear]) {
+
+		if (empty($ret[$dyear])) {
 			$ret[$dyear] = [];
 		}
+
 		$ret[$dyear][] = [$str, $end_month, $start_month];
 		$dnow = DateTimeFormat::utc($dnow . ' -1 month', 'Y-m-d');
 	}