aboutsummaryrefslogtreecommitdiffstats
path: root/include/bbcode.php
diff options
context:
space:
mode:
authorHabeas Codice <habeascodice@federated.social>2015-02-16 15:13:31 -0800
committerHabeas Codice <habeascodice@federated.social>2015-02-16 15:13:31 -0800
commitd9d029470f188796988e002eb90e9dbf96d3dd29 (patch)
treeef922432ae326f358374535bf68492729134e49e /include/bbcode.php
parentca8e22101803454be60af35d2cf71ae80224805a (diff)
parent1d1676094dd82482f113d6de9c2a95407a1a692f (diff)
downloadvolse-hubzilla-d9d029470f188796988e002eb90e9dbf96d3dd29.tar.gz
volse-hubzilla-d9d029470f188796988e002eb90e9dbf96d3dd29.tar.bz2
volse-hubzilla-d9d029470f188796988e002eb90e9dbf96d3dd29.zip
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/bbcode.php')
-rw-r--r--include/bbcode.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 8f2b5bd38..749bc2334 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -625,6 +625,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/sm", '<table border="1" >$1</table>' ,$Text);
$Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/sm", '<table border="0" >$1</table>' ,$Text);
}
+ $Text = str_replace('</tr><br /><tr>',"</tr>\n<tr>",$Text);
$Text = str_replace('[hr]','<hr />', $Text);
// This is actually executed in prepare_body()