diff --git a/src/Content/Item.php b/src/Content/Item.php
index 58fe945d32..25d27b26df 100644
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -223,19 +223,13 @@ class Item
 
 				// select someone by nick in the current network
 				if (!DBA::isResult($contact) && ($network != '')) {
-					$condition = [
-						"`nick` = ? AND `network` = ? AND `uid` = ?",
-						$name, $network, $profile_uid
-					];
+					$condition = ['nick' => $name, 'network' => $network, 'uid' => $profile_uid];
 					$contact = DBA::selectFirst('contact', $fields, $condition);
 				}
 
 				// select someone by attag in the current network
 				if (!DBA::isResult($contact) && ($network != '')) {
-					$condition = [
-						"`attag` = ? AND `network` = ? AND `uid` = ?",
-						$name, $network, $profile_uid
-					];
+					$condition = ['attag' => $name, 'network' => $network, 'uid' => $profile_uid];
 					$contact = DBA::selectFirst('contact', $fields, $condition);
 				}
 
@@ -247,13 +241,13 @@ class Item
 
 				// select someone by nick in any network
 				if (!DBA::isResult($contact)) {
-					$condition = ["`nick` = ? AND `uid` = ?", $name, $profile_uid];
+					$condition = ['nick' => $name, 'uid' => $profile_uid];
 					$contact = DBA::selectFirst('contact', $fields, $condition);
 				}
 
 				// select someone by attag in any network
 				if (!DBA::isResult($contact)) {
-					$condition = ["`attag` = ? AND `uid` = ?", $name, $profile_uid];
+					$condition = ['attag' => $name, 'uid' => $profile_uid];
 					$contact = DBA::selectFirst('contact', $fields, $condition);
 				}
 
@@ -339,9 +333,8 @@ class Item
 					default:
 						if ($obj['resource-id']) {
 							$post_type = $this->l10n->t('photo');
-							$m = [];
-							preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
-							$rr['plink'] = $m[1];
+							preg_match("/\[url=([^]]*)\]/", $obj['body'], $matches);
+							$rr['plink'] = $matches[1];
 						} else {
 							$post_type = $this->l10n->t('status');
 						}
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index f072e59c9d..33f91b43d1 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -870,8 +870,7 @@ class BBCode
 					$attributes[$field] = html_entity_decode($matches[2] ?? '', ENT_QUOTES, 'UTF-8');
 				}
 
-				$img_str = '<img src="' .
-					self::proxyUrl($match[2], $simplehtml, $uriid) . '"';
+				$img_str = '<img src="' . self::proxyUrl($match[2], $simplehtml, $uriid) . '"';
 				foreach ($attributes as $key => $value) {
 					if (!empty($value)) {
 						$img_str .= ' ' . $key . '="' . htmlspecialchars($value, ENT_COMPAT) . '"';