diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-30 21:51:33 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-30 21:51:33 -0400 |
| commit | 0fd8eeec23a0613db8ea6c5bb54b4658ddaa0e61 (patch) | |
| tree | b6684b05aee92729406a90f397ccd446f58863c7 /include/bbcode.php | |
| parent | 7124c0aee5486aab74272c81ceb3e383b2e3a7f7 (diff) | |
| parent | 852b2659e9a71f0542e822aa20efc009e22ff66a (diff) | |
| download | volse-hubzilla-0fd8eeec23a0613db8ea6c5bb54b4658ddaa0e61.tar.gz volse-hubzilla-0fd8eeec23a0613db8ea6c5bb54b4658ddaa0e61.tar.bz2 volse-hubzilla-0fd8eeec23a0613db8ea6c5bb54b4658ddaa0e61.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 0bf326506..7f7be4300 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -498,6 +498,18 @@ function bb_highlight($match) { return $match[0]; } +function bb_fixtable_lf($match) { + + // remove extraneous whitespace between table element tags since newlines will all + // be converted to '<br />' and turn your neatly crafted tables into a whole lot of + // empty space. + + $x = preg_replace("/\]\s+\[/",'][',$match[1]); + return '[table]' . $x . '[/table]'; + +} + + // BBcode 2 HTML was written by WAY2WEB.net // extended to work with Mistpark/Friendica/Redmatrix/Hubzilla - Mike Macgirvin @@ -579,7 +591,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) $Text = preg_replace_callback("/\[code=(.*?)\](.*?)\[\/code\]/ism", 'bb_highlight', $Text); } - + $Text = preg_replace_callback("/\[table\](.*?)\[\/table\]/ism",'bb_fixtable_lf',$Text); // Convert new line chars to html <br /> tags |