[Phpfreechat-svn] SF.net SVN: phpfreechat: [616] trunk/src/pfci18n.class.php

[<ke...@us...>]

Revision: 616
Author:   kerphi
Date:     2006-06-17 05:33:51 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=616&view=rev

Log Message:
-----------
Warning fix: iconv(): Wrong charset, conversion from `UTF-8' to `UTF-8' is not allowed

Modified Paths:
--------------
    trunk/src/pfci18n.class.php
Modified: trunk/src/pfci18n.class.php
===================================================================
--- trunk/src/pfci18n.class.php	2006-06-17 12:33:27 UTC (rev 615)
+++ trunk/src/pfci18n.class.php	2006-06-17 12:33:51 UTC (rev 616)
@@ -26,7 +26,9 @@
 {
   $args = func_get_args();
   $args[0] = isset($GLOBALS["i18n"][$args[0]]) && $GLOBALS["i18n"][$args[0]] != "" ?
-    iconv("UTF-8", $GLOBALS["output_encoding"], $GLOBALS["i18n"][$args[0]]) :
+    ($GLOBALS["output_encoding"] == "UTF-8" ?
+       $GLOBALS["i18n"][$args[0]] :
+       iconv("UTF-8", $GLOBALS["output_encoding"], $GLOBALS["i18n"][$args[0]])) :
     "_".$args[0]."_";
   return call_user_func_array('sprintf', $args);
 }


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