[phpwiki-checkins] SF.net SVN: phpwiki:[7034] trunk/lib

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

Revision: 7034
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7034&view=rev
Author:   vargenau
Date:     2009-07-14 10:13:44 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Default to UTF-8

Modified Paths:
--------------
    trunk/lib/loadsave.php
    trunk/lib/ziplib.php

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2009-07-14 10:05:45 UTC (rev 7033)
+++ trunk/lib/loadsave.php	2009-07-14 10:13:44 UTC (rev 7034)
@@ -1233,7 +1233,7 @@
         }
     }
     if (empty($pagehash['charset']))
-        $pagehash['charset'] = 'iso-8859-1';
+        $pagehash['charset'] = 'utf-8';
     // compare to target charset
     if (strtolower($pagehash['charset']) != strtolower($GLOBALS['charset'])) {
         $pageinfo['content'] = charset_convert($params['charset'], $GLOBALS['charset'], $pageinfo['content']);
@@ -1305,7 +1305,7 @@
         // plain old file
         $user = $request->getUser();
 
-        $file_charset = 'iso-8859-1';
+        $file_charset = 'utf-8';
         // compare to target charset
         if ($file_charset != strtolower($GLOBALS['charset'])) {
             $text = charset_convert($file_charset, $GLOBALS['charset'], $text);

Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2009-07-14 10:05:45 UTC (rev 7033)
+++ trunk/lib/ziplib.php	2009-07-14 10:13:44 UTC (rev 7034)
@@ -876,7 +876,7 @@
         ExitWiki( sprintf("Unknown %s", 'encoding type: $encoding') );
 
     if (empty($params['charset']))
-        $params['charset'] = 'iso-8859-1';
+        $params['charset'] = 'utf-8';
 
     // compare to target charset
     if (strtolower($params['charset']) != strtolower($GLOBALS['charset'])) {


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