Merge remote-tracking branch 'upstream/master'

2 files changed, 210 insertions, 0 deletions

diff --git a/_test/cases/inc/parser/parser_links.test.php b/_test/cases/inc/parser/parser_links.test.php
index a4a8c5826..53871e110 100644
--- a/_test/cases/inc/parser/parser_links.test.php
+++ b/_test/cases/inc/parser/parser_links.test.php
@@ -221,6 +221,21 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
         $this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
     }
 
+    function testInternalLinkNoChar() {
+        $this->P->addMode('internallink',new Doku_Parser_Mode_InternalLink());
+        $this->P->parse("Foo [[]] Bar");
+        $calls = array (
+            array('document_start',array()),
+            array('p_open',array()),
+            array('cdata',array("\n".'Foo ')),
+            array('internallink',array('',NULL)),
+            array('cdata',array(' Bar')),
+            array('p_close',array()),
+            array('document_end',array()),
+        );
+        $this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
+    }
+
     function testInternalLinkNamespaceNoTitle() {
         $this->P->addMode('internallink',new Doku_Parser_Mode_InternalLink());
         $this->P->parse("Foo [[foo:bar]] Bar");
diff --git a/_test/cases/inc/parser/xhtml_links.test.php b/_test/cases/inc/parser/xhtml_links.test.php
index 0ad96c793..a9a6dfdbc 100644
--- a/_test/cases/inc/parser/xhtml_links.test.php
+++ b/_test/cases/inc/parser/xhtml_links.test.php
@@ -1,6 +1,7 @@
 <?php
 if (!defined('DOKU_BASE')) define('DOKU_BASE','./');
 require_once DOKU_INC.'inc/parser/xhtml.php';
+require_once DOKU_INC.'inc/pageutils.php';
 
 class xhtml_links_test extends UnitTestCase {
 
@@ -41,4 +42,198 @@ class xhtml_links_test extends UnitTestCase {
         $this->assertEqual($p->doc,$expect);
     }
 
+    /**
+      *  Produced by syntax like [[ ]]
+      */
+    function test_empty_internallink(){
+        $page = 'my:space';
+
+        global $ID;
+        $ID = $page;
+
+        global $conf;
+        $conf['start'] = 'start';
+
+        global $conf;
+        $conf['basedir']     = '/';
+        $conf['useheading']  = 0;
+        $conf['userewrite']  = 0;
+        $conf['useslash']    = 0;
+        $conf['canonical']   = 0;
+
+        $p = new Doku_Renderer_xhtml();
+        $p->internallink('');
+
+
+        if (page_exists($page)) {
+            $class = 'wikilink1';
+            $rel = '';
+        }
+        else {
+            $class = 'wikilink2';
+            $rel = ' rel="nofollow"';
+        }
+
+        $parts = split(':', $page);
+        $caption = $parts[count($parts)-1];
+
+        $expect = '<span class="curid"><a href="/./doku.php?id='.$page.'" class="'.$class.'" title="'.$page.'"'.$rel.'>'.$caption.'</a></span>';
+
+        $this->assertEqual($p->doc, $expect);
+    }
+
+    /**
+      *  Produced by syntax like [[ |my caption]]
+      */
+    function test_empty_internallink_with_caption(){
+        $page = 'my:space';
+        $caption = 'my caption';
+
+        global $ID;
+        $ID = $page;
+
+        global $conf;
+        $conf['basedir']     = '/';
+        $conf['useheading']  = 0;
+        $conf['userewrite']  = 0;
+        $conf['useslash']    = 0;
+        $conf['canonical']   = 0;
+
+        $p = new Doku_Renderer_xhtml();
+        $p->internallink('', $caption);
+
+        if (page_exists($page)) {
+            $class = 'wikilink1';
+            $rel = '';
+        }
+        else {
+            $class = 'wikilink2';
+            $rel = ' rel="nofollow"';
+        }
+
+        $expect = '<span class="curid"><a href="/./doku.php?id='.$page.'" class="'.$class.'" title="'.$page.'"'.$rel.'>'.$caption.'</a></span>';
+
+        $this->assertEqual($p->doc, $expect);
+    }
+
+    /**
+      *  Produced by syntax like [[?do=index]]
+      */
+    function test_empty_internallink_index(){
+        $page = 'my:space';
+
+        global $ID;
+        $ID = $page;
+
+        global $conf;
+        $conf['start'] = 'start';
+
+        global $conf;
+        $conf['basedir']     = '/';
+        $conf['useheading']  = 0;
+        $conf['userewrite']  = 0;
+        $conf['useslash']    = 0;
+        $conf['canonical']   = 0;
+
+        $p = new Doku_Renderer_xhtml();
+        $p->internallink('?do=index');
+
+        if (page_exists($page)) {
+            $class = 'wikilink1';
+            $rel = '';
+        }
+        else {
+            $class = 'wikilink2';
+            $rel = ' rel="nofollow"';
+        }
+
+        $parts = split(':', $page);
+        $caption = $parts[count($parts)-1];
+
+        $expect = '<span class="curid"><a href="/./doku.php?id='.$page.'&amp;do=index" class="'.$class.'" title="'.$page.'"'.$rel.'>'.$caption.'</a></span>';
+
+        $this->assertEqual($p->doc, $expect);
+    }
+
+    /**
+      *  Produced by syntax like [[?do=index|my caption]]
+      */
+    function test_empty_internallink_index_with_caption(){
+        $page = 'my:space';
+        $caption = 'my caption';
+
+        global $ID;
+        $ID = $page;
+
+        global $conf;
+        $conf['basedir']     = '/';
+        $conf['useheading']  = 0;
+        $conf['userewrite']  = 0;
+        $conf['useslash']    = 0;
+        $conf['canonical']   = 0;
+
+        $p = new Doku_Renderer_xhtml();
+        $p->internallink('?do=index', $caption);
+
+        if (page_exists($page)) {
+            $class = 'wikilink1';
+            $rel = '';
+        }
+        else {
+            $class = 'wikilink2';
+            $rel = ' rel="nofollow"';
+        }
+
+        $expect = '<span class="curid"><a href="/./doku.php?id='.$page.'&amp;do=index" class="'.$class.'" title="'.$page.'"'.$rel.'>'.$caption.'</a></span>';
+
+        $this->assertEqual($p->doc, $expect);
+    }
+
+    /**
+      *  Produced by syntax like [[#test]]
+      */
+    function test_empty_locallink(){
+        $page = 'my:spacex';
+        global $ID;
+        $ID = $page;
+
+        global $conf;
+        $conf['basedir']     = '/';
+        $conf['useheading']  = 0;
+        $conf['userewrite']  = 0;
+        $conf['useslash']    = 0;
+        $conf['canonical']   = 0;
+
+        $p = new Doku_Renderer_xhtml();
+        $p->locallink('test');
+
+        $expect = '<a href="#test" title="'.$page.' &crarr;" class="wikilink1">test</a>';
+
+        $this->assertEqual($p->doc, $expect);
+    }
+
+    /**
+      *  Produced by syntax like [[#test|my caption]]
+      */
+    function test_empty_locallink_with_caption(){
+        $page = 'my:spacex';
+        $caption = 'my caption';
+
+        global $ID;
+        $ID = $page;
+
+        global $conf;
+        $conf['basedir']     = '/';
+        $conf['useheading']  = 0;
+        $conf['userewrite']  = 0;
+        $conf['useslash']    = 0;
+        $conf['canonical']   = 0;
+
+        $p = new Doku_Renderer_xhtml();
+        $p->locallink('test', $caption);
+
+        $expect = '<a href="#test" title="'.$page.' &crarr;" class="wikilink1">'.$caption.'</a>';
+
+        $this->assertEqual($p->doc, $expect);
+    }
 }