summaryrefslogtreecommitdiff
path: root/inc/parser/parser.php
diff options
context:
space:
mode:
authorKlap-in <klapinklapin@gmail.com>2013-08-01 23:06:36 +0200
committerKlap-in <klapinklapin@gmail.com>2013-08-01 23:06:36 +0200
commitde489e8bb4161522864aca1d308b9910387ae4bb (patch)
tree697a6ca1a6a3341598a6272dca6e5cf0ee4cd105 /inc/parser/parser.php
parentcc036f74ff14c387f24d72f5a52f2f158208846e (diff)
parent4fb6e51447e840624b59742bec61641d606f5006 (diff)
downloadrpg-de489e8bb4161522864aca1d308b9910387ae4bb.tar.gz
rpg-de489e8bb4161522864aca1d308b9910387ae4bb.tar.bz2
Merge remote-tracking branch 'origin/master' into fetchimagetokexternal
Diffstat (limited to 'inc/parser/parser.php')
-rw-r--r--inc/parser/parser.php8
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() {