From 627fc03f93cc74f443af98f4fbf25564cc24d3fc Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@unistra.fr>
Date: Tue, 30 Jul 2013 11:10:34 +0200
Subject: Fix for the FS#1833 parser error

---
 inc/parser/parser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc/parser/parser.php')

diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 915899f53..6aef3fda5 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -454,8 +454,8 @@ class Doku_Parser_Mode_table extends Doku_Parser_Mode {
     }
 
     function connectTo($mode) {
-        $this->Lexer->addEntryPattern('\n\^',$mode,'table');
-        $this->Lexer->addEntryPattern('\n\|',$mode,'table');
+        $this->Lexer->addEntryPattern('\s*\n\^',$mode,'table');
+        $this->Lexer->addEntryPattern('\s*\n\|',$mode,'table');
     }
 
     function postConnect() {
-- 
cgit v1.2.3


From fc498a423a295d14127239e3838b6fb7bb0c8529 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Tue, 30 Jul 2013 18:48:02 +0200
Subject: FS#2770 - prevent <file> and <code> syntax regex matching token names
 which start '<file' or '<code'

---
 inc/parser/parser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc/parser/parser.php')

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() {
-- 
cgit v1.2.3