summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/parser/handler.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index c9a4fd6d9..9fe5866ad 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -802,6 +802,8 @@ class Doku_Handler_Nest {
$key = count($this->calls);
if ($key and ($call[0] == 'cdata') and ($this->calls[$key-1][0] == 'cdata')) {
$this->calls[$key-1][1][0] .= $call[1][0];
+ } else if ($call[0] == 'eol') {
+ // do nothing (eol shouldn't be allowed, to counter preformatted fix in #1652 & #1699)
} else {
$this->calls[] = $call;
}