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

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

1 files changed, 25 insertions, 0 deletions

diff --git a/_test/tests/inc/common_cleanText.test.php b/_test/tests/inc/common_cleanText.test.php
new file mode 100644
index 000000000..00e70d4c7
--- /dev/null
+++ b/_test/tests/inc/common_cleanText.test.php
@@ -0,0 +1,25 @@
+<?php
+
+class common_cleanText_test extends DokuWikiTest {
+
+    function test_unix(){
+        $unix = 'one
+                two
+
+                three';
+
+        $this->assertEquals($unix,cleanText($unix));
+    }
+
+    function test_win(){
+        $unix = "one\ntwo\nthree";
+        $win = "one\r\ntwo\r\nthree";
+
+        $this->assertEquals(bin2hex($unix), '6f6e650a74776f0a7468726565');
+        $this->assertEquals(bin2hex($win), '6f6e650d0a74776f0d0a7468726565');
+        $this->assertNotEquals($unix, $win);
+        $this->assertEquals($unix, cleanText($win));
+    }
+}
+
+//Setup VIM: ex: et ts=4 :