From: Reini U. <ru...@us...> - 2004-05-16 23:10:55
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18655/lib Modified Files: PagePerm.php config.php Log Message: update_locale wrongly resetted LANG, which broke japanese. japanese now correctly uses EUC_JP, not utf-8. more charset and lang headers to help the browser. Index: PagePerm.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/PagePerm.php,v retrieving revision 1.16 retrieving revision 1.17 diff -u -2 -b -p -d -r1.16 -r1.17 --- PagePerm.php 16 May 2004 22:32:53 -0000 1.16 +++ PagePerm.php 16 May 2004 23:10:44 -0000 1.17 @@ -27,6 +27,7 @@ rcs_id('$Id$'); The previous system was only based on action and current user. (lib/main.php) - Permissions maybe inherited its parent pages, and ultimativly the - optional master page (".") + Permissions may be inherited from its parent pages, a optional the + optional master page ("."), and predefined default permissions, if "." + is not defined. Pagenames starting with "." have special default permissions. For Authentication see WikiUserNew.php, WikiGroup.php and main.php @@ -664,4 +665,9 @@ class PagePermission { // $Log$ +// Revision 1.17 2004/05/16 23:10:44 rurban +// update_locale wrongly resetted LANG, which broke japanese. +// japanese now correctly uses EUC_JP, not utf-8. +// more charset and lang headers to help the browser. +// // Revision 1.16 2004/05/16 22:32:53 rurban // setacl icons Index: config.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v retrieving revision 1.109 retrieving revision 1.110 diff -u -2 -b -p -d -r1.109 -r1.110 --- config.php 8 May 2004 14:06:12 -0000 1.109 +++ config.php 16 May 2004 23:10:44 -0000 1.110 @@ -172,5 +172,5 @@ function update_locale($loc) { } //if (substr($newlocale,0,2) == $loc) // don't update with C or failing setlocale - $GLOBALS['LANG'] = $loc; + if (!isset($GLOBALS['LANG'])) $GLOBALS['LANG'] = $loc; // Try to put new locale into environment (so any // programs we run will get the right locale.) @@ -249,6 +249,8 @@ function pcre_fix_posix_classes ($regexp if (!isset($charset)) $charset = CHARSET; // get rid of constant. pref is dynamic and language specific - if (in_array($GLOBALS['LANG'],array('ja','zh'))) + if (in_array($GLOBALS['LANG'],array('zh'))) $charset = 'utf-8'; + if (in_array($GLOBALS['LANG'],array('ja'))) + $charset = 'EUC-JP'; if (strtolower($charset) == 'utf-8') { // thanks to John McPherson // until posix class names/pcre work with utf-8 @@ -322,4 +324,9 @@ if (!function_exists('is_scalar')) { // // $Log$ +// Revision 1.110 2004/05/16 23:10:44 rurban +// update_locale wrongly resetted LANG, which broke japanese. +// japanese now correctly uses EUC_JP, not utf-8. +// more charset and lang headers to help the browser. +// // Revision 1.109 2004/05/08 14:06:12 rurban // new support for inlined image attributes: [image.jpg size=50x30 align=right] |