Merge pull request #4569 from annando/bugfix-diaspora-reshare

Bugfix: Reshare with added content to Diaspora looked ugly

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 8dd9305ca316f263f98503304ef59492b868eaed..091957c197408ae9921be0904b19f0ec81bbba80 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1123,13 +1123,13 @@ class BBCode
                                }
 
                                if (stripos(normalise_link($link), 'http://twitter.com/') === 0) {
+                                       $text .= '<br /><a href="' . $link . '">' . $link . '</a>';
+                               } else {
                                        $text .= $headline . '<blockquote>' . trim($share[3]) . "</blockquote><br />";
 
                                        if ($link != "") {
                                                $text .= '<br /><a href="' . $link . '">[l]</a>';
                                        }
-                               } else {
-                                       $text .= '<br /><a href="' . $link . '">' . $link . '</a>';
                                }
 
                                break;