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

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

1 files changed, 0 insertions, 28 deletions

diff --git a/_test/cases/inc/utf8_stripspecials.test.php b/_test/cases/inc/utf8_stripspecials.test.php
deleted file mode 100644
index 481f47650..000000000
--- a/_test/cases/inc/utf8_stripspecials.test.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-// use no mbstring help here
-if(!defined('UTF8_NOMBSTRING')) define('UTF8_NOMBSTRING',1);
-require_once DOKU_INC.'inc/utf8.php';
-
-class utf8_stripspecials extends UnitTestCase {
-
-
-    function test1(){
-        // we test multiple cases here - format: string, repl, additional, test
-        $tests   = array();
-        $tests[] = array('asciistring','','','asciistring');
-        $tests[] = array('asciistring','','\._\-:','asciistring');
-        $tests[] = array('ascii.string','','\._\-:','asciistring');
-        $tests[] = array('ascii.string',' ','\._\-:','ascii string');
-        $tests[] = array('2.1.14',' ','\._\-:','2 1 14');
-        $tests[] = array('ascii.string','','\._\-:\*','asciistring');
-        $tests[] = array('ascii.string',' ','\._\-:\*','ascii string');
-        $tests[] = array('2.1.14',' ','\._\-:\*','2 1 14');
-        $tests[] = array('string with nbsps','_','\*','string_with_nbsps');
-
-        foreach($tests as $test){
-            $this->assertEqual(utf8_stripspecials($test[0],$test[1],$test[2]),$test[3]);
-        }
-    }
-
-}
-//Setup VIM: ex: et ts=4 :