[phpwiki-checkins] SF.net SVN: phpwiki:[8899] trunk/themes/default/templates/login.tmpl

[<var...@us...>]

Revision: 8899
          http://sourceforge.net/p/phpwiki/code/8899
Author:   vargenau
Date:     2014-06-12 19:12:34 +0000 (Thu, 12 Jun 2014)
Log Message:
-----------
$charset is UTF-8

Modified Paths:
--------------
    trunk/themes/default/templates/login.tmpl

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2014-06-12 15:58:52 UTC (rev 8898)
+++ trunk/themes/default/templates/login.tmpl	2014-06-12 19:12:34 UTC (rev 8899)
@@ -37,9 +37,9 @@
 if (ALLOW_BOGO_LOGIN && $require_level <= WIKIAUTH_BOGO) {
   require_once("lib/BlockParser.php");
   // This sample covers French, Spanish, Italian, German, and probably others
-  $examplechars = htmlentities("ÀñíçéàÖãæôßøü", ENT_QUOTES, $charset);
+  $examplechars = htmlentities("ÀñíçéàÖãæôßøü", ENT_QUOTES, 'UTF-8');
   // Japanese login requires utf-8 and ALLOW_NONWIKIWORD_LOGINS
-  if (($charset == 'utf-8') && defined('ALLOW_NONWIKIWORD_LOGINS') && ALLOW_NONWIKIWORD_LOGINS) {
+  if (defined('ALLOW_NONWIKIWORD_LOGINS') && ALLOW_NONWIKIWORD_LOGINS) {
     // sample Japanese login name
     $examplechars = $examplechars . "天道あかね";
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.