diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-08-03 10:44:54 +0200 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-08-03 10:44:54 +0200 |
| commit | 6acfab8732e1784b953c8cc2ae7408f84fda7ce8 (patch) | |
| tree | 01e6ac38df46c9ad18f058c8d597617702eb67f3 /inc/parser/parser.php | |
| parent | 51bd6f039e782dca456022514893aa80bd7c52b9 (diff) | |
| parent | cab505616ec9b8ef3cd671e7337c91d065745932 (diff) | |
| download | rpg-6acfab8732e1784b953c8cc2ae7408f84fda7ce8.tar.gz rpg-6acfab8732e1784b953c8cc2ae7408f84fda7ce8.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into changelogtestsonly
Diffstat (limited to 'inc/parser/parser.php')
| -rw-r--r-- | inc/parser/parser.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/inc/parser/parser.php b/inc/parser/parser.php index 915899f53..4af1cd333 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() { @@ -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() { |