Merge remote-tracking branch 'upstream/master' into 1409-diaspora-repeated-twitter...

diff --git a/include/bbcode.php b/include/bbcode.php
index 25d60647f32f2c8ea96ca0170eb91ff22fc49bdf..8efeabb8bfa5c19dd2562af96dfd8003349082af 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -534,10 +534,14 @@ function bb_ShareAttributes($share, $simplehtml) {
                        if ($text != "")
                                $text .= "<hr />";
 
-                       $text .= $headline.'<blockquote class="shared_content">'.trim($share[3])."</blockquote><br />";
+                       if (substr(normalise_link($link), 0, 19) != "http://twitter.com/") {
+                               $text .= $headline.'<blockquote class="shared_content">'.trim($share[3])."</blockquote><br />";
+
+                               if ($link != "")
+                                       $text .= '<br /><a href="'.$link.'">[l]</a>';
+                       } else
+                               $text .= '<br /><a href="'.$link.'">'.$link.'</a>';
 
-                       if ($link != "")
-                               $text .= '<br /><a href="'.$link.'">[l]</a>';
                        break;
                case 4:
                        $headline = '<div class="shared_header">';