[Phpsysinfo-subversion] SF.net SVN: phpsysinfo:[225] includes

[<jac...@us...>]

Revision: 225
          http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=225&view=rev
Author:   jacky672
Date:     2009-05-29 16:18:39 +0000 (Fri, 29 May 2009)

Log Message:
-----------
Fix Windows encoding

Modified Paths:
--------------
    includes/os/class.WINNT.inc.php
    includes/xml/class.XML.inc.php

Modified: includes/os/class.WINNT.inc.php
===================================================================
--- includes/os/class.WINNT.inc.php	2009-05-28 06:41:11 UTC (rev 224)
+++ includes/os/class.WINNT.inc.php	2009-05-29 16:18:39 UTC (rev 225)
@@ -77,7 +77,7 @@
     private function _getCodeSet()
     {
         $buffer = $this->_getWMI('Win32_OperatingSystem', array('CodeSet'));
-        $this->_charset = $buffer[0]['CodeSet'];
+        $this->_charset = 'windows-'.$buffer[0]['CodeSet'];
     }
     
     /**

Modified: includes/xml/class.XML.inc.php
===================================================================
--- includes/xml/class.XML.inc.php	2009-05-28 06:41:11 UTC (rev 224)
+++ includes/xml/class.XML.inc.php	2009-05-29 16:18:39 UTC (rev 225)
@@ -504,7 +504,7 @@
      */
     private function _toUTF8($str)
     {
-        if (mb_detect_encoding($str) == 'UTF-8' || !defined('PSI_CONVERT_FROM_CHARSET')) {
+        if (mb_detect_encoding($str) == 'UTF-8' && !defined('PSI_CONVERT_FROM_CHARSET')) {
             return trim($str);
         } else {
             if (defined('PSI_CONVERT_FROM_CHARSET')) {


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