Merge pull request #4569 from annando/bugfix-diaspora-reshare
Bugfix: Reshare with added content to Diaspora looked uglypull/4570/head
commit
f0c9b4cdf8
|
@ -1123,13 +1123,13 @@ class BBCode
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stripos(normalise_link($link), 'http://twitter.com/') === 0) {
|
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 />";
|
$text .= $headline . '<blockquote>' . trim($share[3]) . "</blockquote><br />";
|
||||||
|
|
||||||
if ($link != "") {
|
if ($link != "") {
|
||||||
$text .= '<br /><a href="' . $link . '">[l]</a>';
|
$text .= '<br /><a href="' . $link . '">[l]</a>';
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
$text .= '<br /><a href="' . $link . '">' . $link . '</a>';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue