From 8f381e01aebbddfed9f56ba21e18837e570dee19 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 30 Nov 2011 03:22:01 -0800
Subject: html_entity_decode D* incoming text

---
 mod/message.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod')

diff --git a/mod/message.php b/mod/message.php
index 97868ab18..d48db8807 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -187,7 +187,7 @@ function message_content(&$a) {
 			$o .= replace_macros($tpl, array(
 				'$id' => $rr['id'],
 				'$from_name' =>$rr['from-name'],
-				'$from_url' => $a->get_baseurl() . '/redir/' . $rr['contact-id'],
+				'$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl() . '/redir/' . $rr['contact-id'] : $rr['url'],
 				'$sparkle' => ' sparkle',
 				'$from_photo' => $rr['thumb'],
 				'$subject' => template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>')),
-- 
cgit v1.2.3