From bfdeb23f1844dffca054cb9c17c31a2151d3d9ea Mon Sep 17 00:00:00 2001
From: lupo49 <post@lupo49.de>
Date: Wed, 7 Mar 2012 19:58:33 +0100
Subject: Parser: Allow parser to fully recognize windows share links with a
 hyphen character in it (Currently, the clickable link stops before a hyphen
 character)

---
 inc/parser/parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 68d4e4569..cf132ce97 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -929,7 +929,7 @@ class Doku_Parser_Mode_windowssharelink extends Doku_Parser_Mode {
     var $pattern;
 
     function preConnect() {
-        $this->pattern = "\\\\\\\\\w+?(?:\\\\[\w$]+)+";
+        $this->pattern = "\\\\\\\\\w+?(?:\\\\[\w-$]+)+";
     }
 
     function connectTo($mode) {
-- 
cgit v1.2.3


From e3ab6fc5cbab1aaf365e73abaa3d91c03eebdd47 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sat, 28 Jul 2012 11:06:10 +0200
Subject: Fixed and extended PHPDoc comments and added additional @var comments

---
 inc/parser/parser.php | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index cf132ce97..98fb7939c 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -52,6 +52,9 @@ class Doku_Parser {
 
     var $Handler;
 
+    /**
+     * @var Doku_Lexer $Lexer
+     */
     var $Lexer;
 
     var $modes = array();
@@ -134,6 +137,9 @@ class Doku_Parser {
 */
 class Doku_Parser_Mode {
 
+    /**
+     * @var Doku_Lexer $Lexer
+     */
     var $Lexer;
 
     var $allowedModes = array();
-- 
cgit v1.2.3


From bd28297e917143628c2b78c5635c881864ce9d23 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sat, 28 Jul 2012 11:07:30 +0200
Subject: Replace = & by =& as the former isn't understood by IntelliJ IDEA

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

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

diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 98fb7939c..915899f53 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -62,11 +62,11 @@ class Doku_Parser {
     var $connected = false;
 
     function addBaseMode(& $BaseMode) {
-        $this->modes['base'] = & $BaseMode;
+        $this->modes['base'] =& $BaseMode;
         if ( !$this->Lexer ) {
             $this->Lexer = new Doku_Lexer($this->Handler,'base', true);
         }
-        $this->modes['base']->Lexer = & $this->Lexer;
+        $this->modes['base']->Lexer =& $this->Lexer;
     }
 
     /**
@@ -78,7 +78,7 @@ class Doku_Parser {
             $this->addBaseMode(new Doku_Parser_Mode_base());
         }
         $Mode->Lexer = & $this->Lexer;
-        $this->modes[$name] = & $Mode;
+        $this->modes[$name] =& $Mode;
     }
 
     function connectModes() {
-- 
cgit v1.2.3