Changeset 502 for trunk

Timestamp:

Jan 15, 2010, 6:59:08 PM (15 years ago)

Author:

toemon

Message:

ブロックキャッシュXMLのXML_Unserializerでxml_parseエラー(PHP5 & EUC-JP)のバグ修正　Fixes #279

File:

• trunk/xpressme_integration_kit/include/xpress_block_render.php (modified) (1 diff)

trunk/xpressme_integration_kit/include/xpress_block_render.php

@@ -22 +22 @@
         function xpress_block_cache_read($mydirname,$block_name)
         {
-                        $xml_name = $block_name . '.xml';
-                        $xml_data = xpress_cache_read($mydirname,$xml_name);
-                        
-                        $GLOBALS['DO_LIBXML_PATCH'] = get_xpress_mod_config($mydirname,'libxml_patch');
-                        
+                $xml_name = $block_name . '.xml';
+                $xml_data = xpress_cache_read($mydirname,$xml_name);
+                
+                $GLOBALS['DO_LIBXML_PATCH'] = get_xpress_mod_config($mydirname,'libxml_patch');
+                
+                // The character-code not treatable exists when 'XML_unserialize' of PHP5 processes EUC-JP. 
+                // And, the result is returned by character-code UTF-8. 
+                // Measures
+                // After the character-code is converted into UTF-8, XML_unserialize will be processed. 
+                if ( strstr($xml_data, '<?xml version="1.0" encoding="EUC-JP" ?>') !== false
+                         && version_compare(PHP_VERSION, '5.0.0', '>') )
+                {
+                        $xml_data = str_replace('<?xml version="1.0" encoding="EUC-JP" ?>', '<?xml version="1.0" encoding="UTF-8" ?>', $xml_data);
+                        $ans = mb_convert_variables('UTF-8' , 'EUC-JP', &$xml_data); //EUC-JP to UTF-8
                         $ret = @xpress_XML_unserialize($xml_data);
-                        if (strstr($xml_data, '<?xml version="1.0" encoding="EUC-JP" ?>') !== false){
-                                if (version_compare(PHP_VERSION, '5.0.0', '>')) {
-                                        $ans = mb_convert_variables('EUC-JP' , 'UTF-8', &$ret); //xpress_XML_unserialize() Return UTF-8 at PHP5
-                                }
-                        }
-                        return $ret;
+                        $ans = mb_convert_variables('EUC-JP' , 'UTF-8', &$ret); //UTF-8 to EUC-JP
+                } else {
+                        $ret = xpress_XML_unserialize($xml_data);
+                }
+                return $ret;
         }