Changeset 353 for trunk

Timestamp:

Aug 2, 2009, 4:40:57 PM (15 years ago)

Author:

toemon

Message:

libxml2のバグ回避の実装　fixes #195
およびシステム情報にlibxmlのバージョンを表示するようにした。

Location:

trunk/xpressme_integration_kit

Files:

• admin/index.php (modified) (2 diffs)
• include/xml.php (modified) (1 diff)

trunk/xpressme_integration_kit/admin/index.php

@@ -169 +169 @@
                 echo "SERVER:  ". $_SERVER['SERVER_SOFTWARE']. "<br />\n";
                 echo "PHP Version:   " . phpversion() . "<br />\n";
+                echo 'libxml Version:  ' . LIBXML_DOTTED_VERSION . "<br />\n";
                 echo "MySQL Version:   " . mysql_get_server_info() . "</text><br />";
                 echo "XOOPS Version:   " . XOOPS_VERSION . "</text><br />";
@@ -232 +233 @@
                 echo "<label>" . "<strong>SERVER:</strong>" . ":</label><text>" . $_SERVER['SERVER_SOFTWARE'] . "</text><br />";
                 echo "<label>" . "<strong>PHP Version:</strong>" . ":</label><text>" . phpversion() . "</text><br />";
+                echo "<label>" . "<strong>libxml Version:</strong>" . ":</label><text>" . LIBXML_DOTTED_VERSION . "</text><br />";
                 echo "<label>" . "<strong>MySQL Version:</strong>" . ":</label><text>" . mysql_get_server_info() . "</text><br />";
                 echo "<label>" . "<strong>XOOPS Version:</strong>" . ":</label><text>" . XOOPS_VERSION . "</text><br />";

trunk/xpressme_integration_kit/include/xml.php

@@ -85 +85 @@
                 $this->stack    = array();
                 $this->parent   = &$this->document;
+                
+                //libxml2 ver.2.7.0 -2.7.2 stripping leading angle brackets bug patch
+                if ( 
+                        LIBXML_DOTTED_VERSION == '2.7.0' 
+                        || LIBXML_DOTTED_VERSION == '2.7.1' 
+                        || LIBXML_DOTTED_VERSION == '2.7.2' 
+                        || (
+                                LIBXML_DOTTED_VERSION == '2.7.3'
+                                && version_compare( PHP_VERSION, '5.2.9', '<' )
+                        )
+                ) {
+                        $data =str_replace('&lt;','&#60;',$data );
+                        $data =str_replace('&gt;','&#62;',$data );
+                        $data =str_replace('&amp;','&#38;',$data );
+                }
+                //end Fix
+                
                 // return xml_parse(&$this->parser, &$data, true) ? $this->document : NULL; // GIJ
                 $ret = @xml_parse($this->parser, $data, true) ? $this->document : NULL;