Merge branch 'master' into stable

Conflicts:
	data/deleted.files
	doku.php
	lib/exe/xmlrpc.php

1 files changed, 28 insertions, 28 deletions

diff --git a/_test/cases/inc/parser/parser_headers.test.php b/_test/cases/inc/parser/parser_headers.test.php
index e1c6783f5..688bac2eb 100644
--- a/_test/cases/inc/parser/parser_headers.test.php
+++ b/_test/cases/inc/parser/parser_headers.test.php
@@ -13,12 +13,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',1,6)),
             array('section_open',array(1)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -32,12 +32,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',2,6)),
             array('section_open',array(2)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -51,12 +51,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',3,6)),
             array('section_open',array(3)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -70,12 +70,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',4,6)),
             array('section_open',array(4)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -89,12 +89,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',5,6)),
             array('section_open',array(5)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -108,12 +108,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',2,6)),
             array('section_open',array(2)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -127,12 +127,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',2,6)),
             array('section_open',array(2)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -146,12 +146,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',1,6)),
             array('section_open',array(1)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -165,7 +165,7 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n= Header =\n def\n")),
+            array('cdata',array("\nabc \n= Header =\n def")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -179,12 +179,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('== Header ==',1,6)),
             array('section_open',array(1)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -198,12 +198,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('====== Header ======',5,6)),
             array('section_open',array(5)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -217,12 +217,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n== ====== Header\n")),
+            array('cdata',array("\nabc \n== ====== Header")),
             array('p_close',array()),
             array('header',array('',1,23)),
             array('section_open',array(1)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -243,12 +243,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array('abc '.DOKU_PARSER_EOL)),
+            array('cdata',array('abc ')),
             array('p_close',array()),
             array('header',array('Header',1, 6)),
             array('section_open',array(1)),
             array('p_open',array()),
-            array('cdata',array(' def'.DOKU_PARSER_EOL)),
+            array('cdata',array(' def')),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -263,18 +263,18 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',1,6)),
             array('section_open',array(1)),
             array('p_open',array()),
-            array('cdata',array("\n def abc \n")),
+            array('cdata',array("\n def abc ")),
             array('p_close',array()),
             array('section_close',array()),
             array('header',array('Header2',2,39)),
             array('section_open',array(2)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array())