summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inc/functions.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/functions.php b/inc/functions.php
index 2cbf3e6b..a6fd35c7 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1449,7 +1449,7 @@ function markup(&$body, $track_cites = false) {
$body = str_replace("\r", '', $body);
$body = utf8tohtml($body);
- if (preg_match_all('@<tinyboard ([\w\s]+)>(.+?)</tinyboard>@um', $body, $modifiers, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
+ if (preg_match_all('@<tinyboard ([\w\s]+)>(.+)</tinyboard>@um', $body, $modifiers, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
$skip_chars = 0;
$body_tmp = $body;
@@ -1466,7 +1466,8 @@ function markup(&$body, $track_cites = false) {
// Public ban message
$replacement = sprintf($config['mod']['ban_message'], $modifier['content']);
} elseif ($modifier['type'] == 'raw html') {
- $replacement = html_entity_decode($modifier['content']);
+ $body = html_entity_decode($modifier['content']);
+ return array();
} elseif (preg_match('/^escape /', $modifier['type'])) {
// Escaped (not a real modifier)
$replacement = '<tinyboard ' . substr($modifier['type'], strlen('escape ')) . '>' . $modifier['content'] . '</tinyboard>';