summaryrefslogtreecommitdiff
path: root/inc/parser/parser.php
diff options
context:
space:
mode:
authorChristopher Smith <chris@jalakai.co.uk>2011-04-02 03:36:26 +0100
committerChristopher Smith <chris@jalakai.co.uk>2011-04-02 03:36:26 +0100
commitefb973f8a33b893d0a4d46d6b733530833c4ad41 (patch)
tree9386f06b90a4fc6a5c31183793df17851ca0da26 /inc/parser/parser.php
parent344763ad4e90e41c8a94b0a69a527ff2d6319ab5 (diff)
parenta3f9f75c2624b73c4a57bf2a346ae71bf6a5fb98 (diff)
downloadrpg-efb973f8a33b893d0a4d46d6b733530833c4ad41.tar.gz
rpg-efb973f8a33b893d0a4d46d6b733530833c4ad41.tar.bz2
Merge branch 'master' of git@github.com:splitbrain/dokuwiki
Diffstat (limited to 'inc/parser/parser.php')
-rw-r--r--inc/parser/parser.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index a7764ee9c..e47ce56fa 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -828,7 +828,7 @@ class Doku_Parser_Mode_internallink extends Doku_Parser_Mode {
function connectTo($mode) {
// Word boundaries?
- $this->Lexer->addSpecialPattern("\[\[(?:(?:.*?\[.*?\])|.+?)\]\]",$mode,'internallink');
+ $this->Lexer->addSpecialPattern("\[\[(?:(?:[^[\]]*?\[.*?\])|.+?)\]\]",$mode,'internallink');
}
function getSort() {