diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-18 22:34:16 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-18 22:34:16 -0700 |
| commit | eac35c05e9059ba57aefc878cc669eb0efbbd086 (patch) | |
| tree | 6651a0d2e1a86f8621640173d3f2b3dd75e7cff0 /include | |
| parent | 07b96f2430a7e1b2f4f80fa4daa6c6111b2546ca (diff) | |
| parent | f44ca74e9962dd2ae109c854924840b0adb0fc58 (diff) | |
| download | volse-hubzilla-eac35c05e9059ba57aefc878cc669eb0efbbd086.tar.gz volse-hubzilla-eac35c05e9059ba57aefc878cc669eb0efbbd086.tar.bz2 volse-hubzilla-eac35c05e9059ba57aefc878cc669eb0efbbd086.zip | |
Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/text.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php index 0b4f039af..d4d151f2e 100644 --- a/include/text.php +++ b/include/text.php @@ -687,7 +687,7 @@ function get_tags($s) { // ignore anything in a code block - $s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s); + $s = preg_replace('/\[code(.*?)\](.*?)\[\/code\]/sm','',$s); // ignore anything in [style= ] $s = preg_replace('/\[style=(.*?)\]/sm','',$s); |