Changeset 836 for branches

Timestamp:

Feb 9, 2013, 9:01:42 AM (12 years ago)

Author:

toemon

Message:

PHP5.4 Fatal error: Call-time pass-by-reference fixed #424

Location:

branches/Ver2.4/xpressme_integration_kit/include

Files:

• xml.php (modified) (1 diff)
• xpress_block_header.php (modified) (1 diff)
• xpress_block_render.php (modified) (2 diffs)

branches/Ver2.4/xpressme_integration_kit/include/xml.php

@@ -16 +16 @@
 if( ! function_exists( 'xpress_XML_unserialize' ) ) : // d3pipe Used function
 function & xpress_XML_unserialize(&$xml){
-        $xml_parser = &new xpress_XML();
+        if ( version_compare(PHP_VERSION, '5.0.0', '>')) {
+                eval('$xml_parser = new xpress_XML();');
+        }else {
+                eval('$xml_parser = &new xpress_XML();');
+        }
         $data = &$xml_parser->parse($xml);
         $xml_parser->destruct();

branches/Ver2.4/xpressme_integration_kit/include/xpress_block_header.php

@@ -36 +36 @@
                 {
                         $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
+                        $ans = mb_convert_variables('UTF-8' , 'EUC-JP', $xml_data); //EUC-JP to UTF-8
                         $ret = @xpress_XML_unserialize($xml_data);
-                        $ans = mb_convert_variables('EUC-JP' , 'UTF-8', &$ret); //UTF-8 to EUC-JP
+                        $ans = mb_convert_variables('EUC-JP' , 'UTF-8', $ret); //UTF-8 to EUC-JP
                 } else {
                         $ret = xpress_XML_unserialize($xml_data);

branches/Ver2.4/xpressme_integration_kit/include/xpress_block_render.php

@@ -35 +35 @@
                 {
                         $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
+                        $ans = mb_convert_variables('UTF-8' , 'EUC-JP', $xml_data); //EUC-JP to UTF-8
                         $ret = @xpress_XML_unserialize($xml_data);
-                        $ans = mb_convert_variables('EUC-JP' , 'UTF-8', &$ret); //UTF-8 to EUC-JP
+                        $ans = mb_convert_variables('EUC-JP' , 'UTF-8', $ret); //UTF-8 to EUC-JP
                 } else {
                         $ret = xpress_XML_unserialize($xml_data);
@@ -187 +187 @@
         }
 
-                $tpl =& new XoopsTpl() ;
-                $tpl->template_dir = $xoops_config->module_path . '/templates';
+                if ( version_compare(PHP_VERSION, '5.0.0', '>')) {
+                        eval('$tpl = new XoopsTpl();');
+                }else {
+                        eval('$tpl = & new XoopsTpl();');
+                }
+                $tpl->template_dir = $xoops_config->module_path . '/templates';
                 if (!$tpl->template_exists($templates_file)){
                         $src_file_path = $xoops_config->module_path . '/templates/' .$mydirname. '_' . str_replace(".php", ".html", $block_function_name);