Changeset 364 for trunk

Timestamp:

Aug 20, 2009, 12:54:12 PM (15 years ago)

Author:

toemon

Message:

EUC-JP時のxml_parseエラー修正　fixes #202 (thx goldmagic)

File:

• trunk/xpressme_integration_kit/include/xpress_block_render.php (modified) (2 diffs)

trunk/xpressme_integration_kit/include/xpress_block_render.php

@@ -15 +15 @@
                         $xml = xpress_XML_serialize($block);
                         $xml_name = $block_name . '.xml';
+                        if (WPLANG == 'ja_EUC'){
+                                $xml = str_replace('<?xml version="1.0" ?>', '<?xml version="1.0" encoding="EUC-JP" ?>' , $xml);
+                        }
                         xpress_cache_write($mydirname,$xml_name,$xml);
         }
@@ -21 +24 @@
                         $xml_name = $block_name . '.xml';
                         $xml_data = xpress_cache_read($mydirname,$xml_name);
-                        return @xpress_XML_unserialize($xml_data);
+
+                        $ret = @xpress_XML_unserialize($xml_data);
+                        if (strstr($xml_data, '<?xml version="1.0" encoding="EUC-JP" ?>') !== false){
+                                $ans = mb_convert_variables('EUC-JP' , 'UTF-8', &$ret);
+                        }
+                        return $ret;
         }