diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-30 19:49:15 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-30 19:49:15 -0700 |
| commit | 9e9f2e13fec2c86d9dc40042edb0e33b99afc6c1 (patch) | |
| tree | b2934f4a90fe16f0374f65b8f3e61b396fb0ba8b /include | |
| parent | 6602ff83dd54d0e17c985a5f527654fc2ed83eea (diff) | |
| parent | 0757dbf07f4c8d137f388c529301229b0d1fd8ef (diff) | |
| download | volse-hubzilla-9e9f2e13fec2c86d9dc40042edb0e33b99afc6c1.tar.gz volse-hubzilla-9e9f2e13fec2c86d9dc40042edb0e33b99afc6c1.tar.bz2 volse-hubzilla-9e9f2e13fec2c86d9dc40042edb0e33b99afc6c1.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index f47dc6f2e..42741b392 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -477,9 +477,12 @@ function bb_observer($Text) { return $Text; } - - - +function bb_code($match) { + if(strpos($match[0], "<br />")) + return '<code>' . trim($match[1]) . '</code>'; + else + return '<code class="inline-code">' . trim($match[1]) . '</code>'; +} @@ -785,12 +788,9 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) $Text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm", "<span style=\"font-family: $1;\">$2</span>", $Text); } - // Declare the format for [code] layout - $CodeLayout = '<code>$1</code>'; - // Check for [code] text if (strpos($Text,'[code]') !== false) { - $Text = preg_replace("/\[code\](.*?)\[\/code\]/ism", "$CodeLayout", $Text); + $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism", 'bb_code', $Text); } // Check for [spoiler] text |