X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=e58df19f16cc03908d0c71174fc569750b4530ff;hb=2148a2bdb0cb38d3a085109eeeb6acc5d65484e6;hp=64204c696fd7afbb99635001e03cace994a98a60;hpb=f99bb958f61f17e81452f3f9c4d3472c3de8b37b;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index 64204c696f..e58df19f16 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1,9 +1,10 @@
 <?php
 
+use Friendica\App;
+
 require_once "include/bbcode.php";
 require_once "include/acl_selectors.php";
 
-
 /*
  * Note: the code in 'item_extract_images' and 'item_redir_and_replace_images'
  * is identical to the code in mod/message.php for 'item_extract_images' and
@@ -711,7 +712,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 					$profile_link = zrl($profile_link);
 				}
 
-				if (!x($item, 'author-thumb') OR ($item['author-thumb'] == "")) {
+				if (!x($item, 'author-thumb') || ($item['author-thumb'] == "")) {
 					$author_contact = get_contact_details_by_url($item['author-link'], $profile_owner);
 					if ($author_contact["thumb"]) {
 						$item['author-thumb'] = $author_contact["thumb"];
@@ -720,7 +721,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 					}
 				}
 
-				if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) {
+				if (!isset($item['owner-thumb']) || ($item['owner-thumb'] == "")) {
 					$owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner);
 					if ($owner_contact["thumb"]) {
 						$item['owner-thumb'] = $owner_contact["thumb"];
@@ -1012,7 +1013,7 @@ function item_photo_menu($item) {
 			$menu[t("Poke")] = $poke_link;
 		}
 
-		if ((($cid == 0) OR ($rel == CONTACT_IS_FOLLOWER)) AND
+		if ((($cid == 0) || ($rel == CONTACT_IS_FOLLOWER)) &&
 			in_array($item['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
 			$menu[t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
 		}