summaryrefslogtreecommitdiff
path: root/inc/parser
diff options
context:
space:
mode:
authorChristopher Smith <chris@jalakai.co.uk>2013-08-01 02:42:06 -0700
committerChristopher Smith <chris@jalakai.co.uk>2013-08-01 02:42:06 -0700
commit449bad395f9e2cb21e51c4ec8471577dc587ffbd (patch)
treebe36b96db26ec7d3ba5948ee8a2dbbe890ae01ec /inc/parser
parent15754217312575b58b0594cd63f1e1db57623b42 (diff)
parentfdd9bab63c332a19e213c2cf7c986b8b95e25af6 (diff)
downloadrpg-449bad395f9e2cb21e51c4ec8471577dc587ffbd.tar.gz
rpg-449bad395f9e2cb21e51c4ec8471577dc587ffbd.tar.bz2
Merge pull request #241 from splitbrain/FS#2770
FS#2770 - prevent <file> and <code> syntax regex matching too much
Diffstat (limited to 'inc/parser')
-rw-r--r--inc/parser/parser.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 6aef3fda5..4af1cd333 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -555,7 +555,7 @@ class Doku_Parser_Mode_preformatted extends Doku_Parser_Mode {
class Doku_Parser_Mode_code extends Doku_Parser_Mode {
function connectTo($mode) {
- $this->Lexer->addEntryPattern('<code(?=.*</code>)',$mode,'code');
+ $this->Lexer->addEntryPattern('<code\b(?=.*</code>)',$mode,'code');
}
function postConnect() {
@@ -571,7 +571,7 @@ class Doku_Parser_Mode_code extends Doku_Parser_Mode {
class Doku_Parser_Mode_file extends Doku_Parser_Mode {
function connectTo($mode) {
- $this->Lexer->addEntryPattern('<file(?=.*</file>)',$mode,'file');
+ $this->Lexer->addEntryPattern('<file\b(?=.*</file>)',$mode,'file');
}
function postConnect() {