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

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

1 files changed, 0 insertions, 43 deletions

diff --git a/_test/cases/inc/utf8_substr.test.php b/_test/cases/inc/utf8_substr.test.php
deleted file mode 100644
index 2806d34f1..000000000
--- a/_test/cases/inc/utf8_substr.test.php
+++ /dev/null
@@ -1,43 +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_substr_test extends UnitTestCase {
-
-
-    function test1(){
-        // we test multiple cases here - format: in, offset, length, out
-        $tests   = array();
-        $tests[] = array('asciistring',2,null,'ciistring');
-        $tests[] = array('asciistring',2,4,'ciis');
-        $tests[] = array('asciistring',-4,null,'ring');
-        $tests[] = array('asciistring',2,-4,'ciist');
-        $tests[] = array('asciistring',-6,-2,'stri');
-
-        $tests[] = array('живπά우리をあöä',2,null,'вπά우리をあöä');
-        $tests[] = array('живπά우리をあöä',2,4,'вπά우');
-        $tests[] = array('живπά우리をあöä',-4,null,'をあöä');
-        $tests[] = array('живπά우리をあöä',2,-4,'вπά우리');
-        $tests[] = array('живπά우리をあöä',-6,-2,'우리をあ');
-
-        foreach($tests as $test){
-            $this->assertEqual(utf8_substr($test[0],$test[1],$test[2]),$test[3]);
-        }
-    }
-
-    function test2_bug891() {
-        // we test multiple cases here - format: in, offset, length, out
-        $tests   = array();
-
-        $str = str_repeat('в',66000).'@@';
-        $tests[] = array($str, 65600, 1, 'в');
-        $tests[] = array($str,0,66002,$str);
-
-        foreach($tests as $test){
-            $this->assertEqual(utf8_substr($test[0],$test[1],$test[2]),$test[3]);
-        }
-    }
-
-}
-//Setup VIM: ex: et ts=4 :