Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements

Conflicts:
	lib/tpl/dokuwiki/css/basic.css

1 files changed, 0 insertions, 106 deletions

diff --git a/_test/cases/inc/pageutils_getid.test.php b/_test/cases/inc/pageutils_getid.test.php
deleted file mode 100644
index 6eddeb5ea..000000000
--- a/_test/cases/inc/pageutils_getid.test.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-require_once DOKU_INC.'inc/utf8.php';
-require_once DOKU_INC.'inc/pageutils.php';
-
-class init_getID_test extends UnitTestCase {
-
-    /**
-     * fetch media files with basedir and urlrewrite=2
-     * 
-     * data provided by Jan Decaluwe <jan@jandecaluwe.com>
-     */
-    function test1(){
-        global $conf;
-        $conf['basedir'] = '//';
-        $conf['userewrite'] = 2;
-        $conf['deaccent'] = 0; // the default (1) gives me strange exceptions
-
-
-        $_SERVER['SCRIPT_FILENAME'] = '/lib/exe/fetch.php';
-        $_SERVER['REQUEST_URI'] = '/lib/exe/fetch.php/myhdl-0.5dev1.tar.gz?id=snapshots&cache=cache';
-
-        $this->assertEqual(getID('media'), 'myhdl-0.5dev1.tar.gz');
-    }
-
-
-    /**
-     * getID with internal mediafile, urlrewrite=2, no basedir set, apache, mod_php
-     */
-    function test2(){
-        global $conf;
-        $conf['basedir'] = '';
-        $conf['userewrite'] = '2';
-        $conf['baseurl'] = '';
-        $conf['useslash'] = '1';
-        $_SERVER['DOCUMENT_ROOT'] = '/var/www/';
-        $_SERVER['HTTP_HOST'] = 'xerxes.my.home';
-        $_SERVER['SCRIPT_FILENAME'] = '/var/www/dokuwiki/lib/exe/detail.php';
-        $_SERVER['PHP_SELF'] = '/dokuwiki/lib/exe/detail.php/wiki/discussion/button-dw.png';
-        $_SERVER['REQUEST_URI'] = '/dokuwiki/lib/exe/detail.php/wiki/discussion/button-dw.png?id=test&debug=1';
-        $_SERVER['SCRIPT_NAME'] = '/dokuwiki/lib/exe/detail.php';
-        $_SERVER['PATH_INFO'] = '/wiki/discussion/button-dw.png';
-        $_SERVER['PATH_TRANSLATED'] = '/var/www/wiki/discussion/button-dw.png';
-
-        $this->assertEqual(getID('media',true), 'wiki:discussion:button-dw.png');
-        $this->assertEqual(getID('media',false), 'wiki/discussion/button-dw.png');
-    }
-
-    /**
-     * getID with given id in url and userewrite=2, no basedir set, dokuwiki not in document root.
-     */
-    function test3() {
-        global $conf;
-        $conf['basedir'] = '';
-        $conf['userewrite'] = '2';
-        $conf['baseurl'] = '';
-        $_SERVER['DOCUMENT_ROOT'] = '/var/www/';
-        $_SERVER['SCRIPT_FILENAME'] = '/usr/share/dokuwiki/doku.php';
-        $_SERVER['SCRIPT_NAME'] = '/dokuwiki/doku.php';
-        $_SERVER['REQUEST_URI'] = '/dokuwiki/doku.php/wiki:dokuwiki';
-        $_SERVER['PATH_INFO'] = '/wiki:dokuwiki';
-        $_SERVER['PATH_TRANSLATED'] = '/var/www/wiki:dokuwiki';
-        $_SERVER['PHP_SELF'] = '/dokuwiki/doku.php/wiki:dokuwiki';
-
-        $this->assertEqual(getID(), 'wiki:dokuwiki');
-    }
-
-    /**
-     * getID with given id in url and userewrite=2, no basedir set, Apache and CGI.
-     */
-    function test4() {
-        global $conf;
-        $conf['basedir'] = '';
-        $conf['userewrite'] = '2';
-        $conf['baseurl'] = '';
-        $_SERVER['DOCUMENT_ROOT'] = '/var/www/vhosts/example.com/htdocs';
-        $_SERVER['SCRIPT_FILENAME'] = '/var/www/vhosts/example.com/htdocs/doku.php';
-        $_SERVER['SCRIPT_NAME'] = '/doku.php';
-        $_SERVER['REQUEST_URI'] = '/doku.php/wiki/dokuwiki';
-        $_SERVER['PATH_INFO'] = '/wiki/dokuwiki';
-        $_SERVER['PATH_TRANSLATED'] = '/var/www/vhosts/example.com/htdocs/doku.php';
-        $_SERVER['PHP_SELF'] = '/doku.php/wiki/dokuwiki';
-
-        $this->assertEqual(getID(), 'wiki:dokuwiki');
-    }
-
-    /**
-     * getID with given id / in url and userewrite=2, no basedir set, Apache and CGI.
-     */
-    function test5() {
-        global $conf;
-        $conf['basedir'] = '';
-        $conf['userewrite'] = '2';
-        $conf['baseurl'] = '';
-        $_SERVER['DOCUMENT_ROOT'] = '/var/www/';
-        $_SERVER['SCRIPT_FILENAME'] = '/var/www/dokuwiki/doku.php';
-        $_SERVER['SCRIPT_NAME'] = '/dokuwiki/doku.php';
-        $_SERVER['REQUEST_URI'] = '/dokuwiki/doku.php/?do=debug';
-        $_SERVER['PATH_INFO'] = '/';
-        $_SERVER['PATH_TRANSLATED'] = '/var/www/index.html';
-        $_SERVER['PHP_SELF'] = '/dokuwiki/doku.php/';
-
-        $this->assertEqual(getID(), cleanID($conf['start']));
-    }
-
-}
-//Setup VIM: ex: et ts=4 :