Fix issues with non-ASCII characters in wiki file names

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1464 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/include/wiki.inc.php b/include/wiki.inc.php
index 1a5717e..110ad3f 100644 (file)
--- a/include/wiki.inc.php
+++ b/include/wiki.inc.php
@@ -40,9 +40,9 @@ function wiki_pagename()
 function wiki_filename($s)
 {
     if (@iconv('utf-8', 'utf-8', $s) == $s) {
-        return utf8_decode($s);
+        return $s;
     }
-    return $s;
+    return utf8_encode($s);
 }
 
 function wiki_work_dir()

diff --git a/upgrade/0.9.14/wiki.utf8.sh b/upgrade/0.9.14/wiki.utf8.sh
index 06a90d5..4e62d0f 100644 (file)
--- a/upgrade/0.9.14/wiki.utf8.sh
+++ b/upgrade/0.9.14/wiki.utf8.sh
@@ -4,8 +4,9 @@ WIKISPOOLDIR='../../spool/wiki.d/'
 
 find $WIKISPOOLDIR -name 'cache_*' -or -name 'tmp_*' -exec rm {} ";"
 for i in `find $WIKISPOOLDIR -type f`; do
+    CONV=`echo -n $i | iconv -t UTF-8`
     mv $i $i.latin1
-    iconv -t UTF-8 $i.latin1 > $i
+    iconv -t UTF-8 $i.latin1 > $CONV
 done
 
 echo "Les pages de wiki ont ete converites en UTF-8"