Better content detection for posts to Twitter

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 96ba599348b89c13097e342e56c84ab2cee48bb7..f358ba975a5c2d0807b28e202255b3c0cd31e9dd 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -470,7 +470,7 @@ function message_content(App $a) {
                                'id' => $message['id'],
                                'from_name' => $from_name_e,
                                'from_url' => $from_url,
-                               'from_url2' => $message['from-url'],
+                               'from_addr' => $contact['addr'],
                                'sparkle' => $sparkle,
                                'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
                                'subject' => $subject_e,
@@ -584,7 +584,7 @@ function render_messages(array $msg, $t) {
                        '$id' => $rr['id'],
                        '$from_name' => $participants,
                        '$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']),
-                       '$from_url2' => $rr['url'],
+                       '$from_addr' => $contact['addr'],
                        '$sparkle' => ' sparkle',
                        '$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
                        '$subject' => $subject_e,