diff options
| -rw-r--r-- | _test/cases/inc/common_pagetemplate.test.php | 19 | ||||
| -rw-r--r-- | inc/common.php | 2 |
2 files changed, 20 insertions, 1 deletions
diff --git a/_test/cases/inc/common_pagetemplate.test.php b/_test/cases/inc/common_pagetemplate.test.php new file mode 100644 index 000000000..ecba0f966 --- /dev/null +++ b/_test/cases/inc/common_pagetemplate.test.php @@ -0,0 +1,19 @@ +<?php + +require_once DOKU_INC.'inc/common.php'; + +class common_pagetemplate_test extends UnitTestCase { + + function test_none(){ + global $conf; + $conf['sepchar'] = '-'; + $data = array( + 'id' => 'page-id-long', + 'tpl' => '"@PAGE@" "@!PAGE@" "@!!PAGE@" "@!PAGE!@"', + ); + $old = error_reporting(E_ALL & ~E_NOTICE); + $this->assertEqual(parsePageTemplate($data), '"page id long" "Page id long" "Page Id Long" "PAGE ID LONG"'); + error_reporting($old); + } +} +//Setup VIM: ex: et ts=4 enc=utf-8 : diff --git a/inc/common.php b/inc/common.php index 6af7f49de..3e760419f 100644 --- a/inc/common.php +++ b/inc/common.php @@ -843,7 +843,7 @@ function parsePageTemplate(&$data) { // replace placeholders $file = noNS($id); - $page = strtr($file,'_',' '); + $page = strtr($file, $conf['sepchar'], ' '); $tpl = str_replace(array( '@ID@', |