From: friendica <info@friendica.com>
Date: Sat, 18 Aug 2012 05:06:13 +0000 (-0700)
Subject: wall-to-wall posts not identified correctly after thread mod
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d96b9cda43df132ae9d71c6c867504fc29f5a621;p=friendica.git

wall-to-wall posts not identified correctly after thread mod
---

diff --git a/include/conversation.php b/include/conversation.php
index 5f3d7353e5..05adb9a121 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -444,37 +444,37 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 					$template = $wallwall_template;
 					$commentww = 'ww';	
 				}
-			}
-			else if($item['owner-link']) {
+				else if($item['owner-link']) {
 
-				$owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
-				$alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
-				$owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
-				if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
+					$owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
+					$alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
+					$owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
+					if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
 
-					// The author url doesn't match the owner (typically the contact)
-					// and also doesn't match the contact alias. 
-					// The name match is a hack to catch several weird cases where URLs are 
-					// all over the park. It can be tricked, but this prevents you from
-					// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
-					// well that it's the same Bob Smith. 
+						// The author url doesn't match the owner (typically the contact)
+						// and also doesn't match the contact alias. 
+						// The name match is a hack to catch several weird cases where URLs are 
+						// all over the park. It can be tricked, but this prevents you from
+						// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
+						// well that it's the same Bob Smith. 
 
-					// But it could be somebody else with the same name. It just isn't highly likely. 
+						// But it could be somebody else with the same name. It just isn't highly likely. 
 					
 
-					$owner_url = $item['owner-link'];
-					$owner_photo = $item['owner-avatar'];
-					$owner_name = $item['owner-name'];
-					$template = $wallwall_template;
-					$commentww = 'ww';
-					// If it is our contact, use a friendly redirect link
-					if((link_compare($item['owner-link'],$item['url'])) 
-						&& ($item['network'] === NETWORK_DFRN)) {
-						$owner_url = $redirect_url;
-						$osparkle = ' sparkle';
+						$owner_url = $item['owner-link'];
+						$owner_photo = $item['owner-avatar'];
+						$owner_name = $item['owner-name'];
+						$template = $wallwall_template;
+						$commentww = 'ww';
+						// If it is our contact, use a friendly redirect link
+						if((link_compare($item['owner-link'],$item['url'])) 
+							&& ($item['network'] === NETWORK_DFRN)) {
+							$owner_url = $redirect_url;
+							$osparkle = ' sparkle';
+						}
+						else
+							$owner_url = zrl($owner_url);
 					}
-					else
-						$owner_url = zrl($owner_url);
 				}
 			}
 			if($profile_owner == local_user()) {