From: Roland Häder <roland@mxchange.org>
Date: Tue, 20 Dec 2016 16:43:46 +0000 (+0100)
Subject: added more curly braces + space between "if" and brace
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=54905a3d81065915418af7f96953f957bf795300;p=friendica.git

added more curly braces + space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/mod/subthread.php b/mod/subthread.php
index 69b7f3a601..c689f7f6cb 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -86,14 +86,7 @@ function subthread_content(App &$a) {
 	$uri = item_new_uri($a->get_hostname(),$owner_uid);
 
 	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
-<<<<<<< upstream/develop
 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
-=======
-	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
-<<<<<<< upstream/develop
->>>>>>> HEAD~33
-=======
->>>>>>> HEAD~32
 	$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 	$body = $item['body'];