summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandi <andi@splitbrain.org>2005-01-23 21:14:06 +0100
committerandi <andi@splitbrain.org>2005-01-23 21:14:06 +0100
commit8b709e9deb31ed5cbdc62de04f539b5b56271341 (patch)
tree8f8cba63800315bb03d3708d539d8df38eecc199
parentb77734d63a7cb01074d51c394b9ae2ab9e1344b8 (diff)
downloadrpg-8b709e9deb31ed5cbdc62de04f539b5b56271341.tar.gz
rpg-8b709e9deb31ed5cbdc62de04f539b5b56271341.tar.bz2
deaccenting config
darcs-hash:20050123201406-9977f-68b7ed58d460af96a0a076d973aa4f2568fb28b8.gz
-rw-r--r--conf/dokuwiki.php3
-rw-r--r--inc/common.php3
2 files changed, 2 insertions, 4 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 1b3d64dbb..5107675de 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -34,8 +34,7 @@ $conf['signature'] = ' --- //[[@MAIL@|@NAME@]] @DATE@//'; //signature see wiki
$conf['maxtoclevel'] = 3; //Up to which level include into AutoTOC (max. 5)
$conf['maxseclevel'] = 3; //Up to which level create editable sections (max. 5)
$conf['camelcase'] = 0; //Use CamelCase for linking? (I don't like it) 0|1
-$conf['localnames'] = 0; //Allow non-ASCII chars in pagenames (0|1)
- //You need a correct locale for this!
+$conf['deaccent'] = 1; //convert accented chars to unaccented ones in pagenames?
/* Antispam Features */
diff --git a/inc/common.php b/inc/common.php
index 42fcf82c3..dddb231cf 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -415,8 +415,7 @@ function cleanID($id){
$id = strtr($id,';',':');
if($conf['useslash']) $id = strtr($id,'/',':');
- //FIXME use config to ask for deaccenting
- $id = utf8_deaccent($id,-1);
+ if($conf['deaccent']) $id = utf8_deaccent($id,-1);
//remove specials (only ascii specials are removed)
$id = preg_replace('#[ !"§$%&()\[\]{}\\?`\'\#~*+=,<>\|^°@µ¹²³¼½¬]#u','_',$id);