Merge pull request #400 from annando/master

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 71627918189902b2f195af715e73bd2cb8aa7e03..546e27db67fa772985493f09a4e65cf3b04e88f5 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -234,6 +234,7 @@ function localize_item(&$item){
                                $item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
                }
        }
+
        // add zrl's to public images
        if(preg_match_all('/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
                foreach($matches as $mtch) {
@@ -771,7 +772,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                        'text' => strip_tags(template_escape($body)),
                                        'id' => $item['item_id'],
                                        'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
-                                       'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
+                                       'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner-name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
                                        'to' => t('to'),
                                        'wall' => t('Wall-to-Wall'),
                                        'vwall' => t('via Wall-To-Wall:'),