]> git.mxchange.org Git - friendica.git/commitdiff
wall-to-wall posts not identified correctly after thread mod
authorfriendica <info@friendica.com>
Sat, 18 Aug 2012 05:06:13 +0000 (22:06 -0700)
committerfriendica <info@friendica.com>
Sat, 18 Aug 2012 05:06:13 +0000 (22:06 -0700)
include/conversation.php

index 5f3d7353e52ab8870a197a06f5b5fbde36770886..05adb9a121b38c5f6bd52dea16f7f15669c4fbc9 100644 (file)
@@ -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()) {