Fixed broken link rendering for external links at start of line

External links at the start of line like 'www.example.com' were not rendered as links any more. The issue was introduced with PR #1988. Fixes #2399.
dokuwiki · Jun 21, 2018 · 605005e · 605005e
1 parent e954c88
commit 605005e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/_test/tests/inc/parser/parser_links.test.php b/_test/tests/inc/parser/parser_links.test.php
@@ -144,6 +144,20 @@ function testExternalWWWLink() {
         $this->assertEquals(array_map('stripByteIndex',$this->H->calls),$calls);
     }
 
+    function testExternalWWWLinkStartOfLine() {
+        // Regression test for issue #2399
+        $calls = array (
+            array('document_start',array()),
+            array('p_open',array()),
+            array('externallink',array('http://www.google.com', 'www.google.com')),
+            array('cdata',array(' Bar')),
+            array('p_close',array()),
+            array('document_end',array()),
+        );
+        $instructions = p_get_instructions("www.google.com Bar");
+        $this->assertEquals(array_map('stripByteIndex',$instructions),$calls);
+    }
+
     function testExternalWWWLinkInPath() {
         $this->P->addMode('externallink',new Doku_Parser_Mode_ExternalLink());
         // See issue #936. Should NOT generate a link!

diff --git a/inc/parser/parser.php b/inc/parser/parser.php
@@ -955,8 +955,8 @@ function preConnect() {
             $this->patterns[] = '\b(?i)'.$scheme.'(?-i)://['.$any.']+?(?=['.$punc.']*[^'.$any.'])';
         }
 
-        $this->patterns[] = '(?<=\s)(?i)www?(?-i)\.['.$host.']+?\.['.$host.']+?['.$any.']+?(?=['.$punc.']*[^'.$any.'])';
-        $this->patterns[] = '(?<=\s)(?i)ftp?(?-i)\.['.$host.']+?\.['.$host.']+?['.$any.']+?(?=['.$punc.']*[^'.$any.'])';
+        $this->patterns[] = '(?<!/)\b(?i)www?(?-i)\.['.$host.']+?\.['.$host.']+?['.$any.']+?(?=['.$punc.']*[^'.$any.'])';
+        $this->patterns[] = '(?<!/)\b(?i)ftp?(?-i)\.['.$host.']+?\.['.$host.']+?['.$any.']+?(?=['.$punc.']*[^'.$any.'])';
     }
 
     function connectTo($mode) {