diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-18 16:10:41 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-18 16:10:41 -0700 |
| commit | 7524948a970271072030b3f67183152b2c23081b (patch) | |
| tree | 3fac59836db8a13b2fca78c09f154518690245d9 | |
| parent | f9b67d3630785958cf21d2368d63a1aa28b1d783 (diff) | |
| parent | 3beb94dc522453a0cfbf2705ed335b20aad5bc76 (diff) | |
| download | volse-hubzilla-7524948a970271072030b3f67183152b2c23081b.tar.gz volse-hubzilla-7524948a970271072030b3f67183152b2c23081b.tar.bz2 volse-hubzilla-7524948a970271072030b3f67183152b2c23081b.zip | |
Merge branch 'dev' into perms
| -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 af51f9963..dd7d9eaa8 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); |