diff options
| author | Michael Foster <savetheinternet@tinyboard.org> | 2013-08-17 17:53:39 +1000 |
|---|---|---|
| committer | Michael Foster <savetheinternet@tinyboard.org> | 2013-08-17 17:53:39 +1000 |
| commit | 998002fd3442ad036391293fbb4382552081bf0f (patch) | |
| tree | 08afdd71da87e41f8c7d4ebe68f4c28a7b0373a2 | |
| parent | b2d5ec253b53345f46f6e1a246a725167d4ab814 (diff) | |
better modifier escaping again
| -rw-r--r-- | inc/functions.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/inc/functions.php b/inc/functions.php index 50937a29..d1ae2267 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1482,7 +1482,8 @@ function markup(&$body, $track_cites = false) { $modifiers = extract_modifiers($body); - $body = preg_replace('@<tinyboard ([\w\s]+)>(.+?)</tinyboard>@us', '', $body); + $body = preg_replace('@<tinyboard (?!escape )([\w\s]+)>(.+?)</tinyboard>@us', '', $body); + $body = preg_replace('@<tinyboard escape ([\w\s]+)>@i', '<tinyboard $1>', $body); if (isset($modifiers['raw html']) && $modifiers['raw html'] == '1') return $body; |