[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.254,1.255

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23303

Modified Files:
	stdlib.php 
Log Message:
Try to dl() load the iconv extension, if not already loaded


Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -2 -b -p -d -r1.254 -r1.255
--- stdlib.php	2 Dec 2006 19:53:05 -0000	1.254
+++ stdlib.php	22 Dec 2006 16:53:38 -0000	1.255
@@ -1858,7 +1858,9 @@ function fixTitleEncoding( $s ) {
         if ($locharset == 'iso-8859-1')
             return utf8_decode( $s );
-        else
-            // TODO: check for iconv support
+        else {
+            // check for iconv support
+            loadPhpExtension("iconv");
             return iconv( "UTF-8", $charset, $s );
+        }
 
     if ($locharset == "utf-8" and $ishigh and !$isutf )
@@ -2087,4 +2089,7 @@ function getMemoryUsage() {
 
 // $Log$
+// Revision 1.255  2006/12/22 16:53:38  rurban
+// Try to dl() load the iconv extension, if not already loaded
+//
 // Revision 1.254  2006/12/02 19:53:05  rurban
 // Simplify DISABLE_MARKUP_WIKIWORD handling by adding the new function