Merge remote-tracking branch 'friendika/master'

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 82a107c07c28bac989a39ae301cab2a0ca6f9a53..50032cd36798e57f653e36e66c13b184b0ab8873 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -347,7 +347,7 @@ function conversation(&$a, $items, $mode, $update) {
 
                        if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) {
 
-                               if($item['type'] === 'wall') {
+                               if($item['wall']) {
 
                                        // On the network page, I am the owner. On the display page it will be the profile owner.
                                        // This will have been stored in $a->page_contact by our calling page.
@@ -359,7 +359,7 @@ function conversation(&$a, $items, $mode, $update) {
                                        $template = $wallwall;
                                        $commentww = 'ww';      
                                }
-                               if(($item['type'] === 'remote') && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
+                               if((! $item['wall']) && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
 
                                        // Could be anybody.