General: Check to see that the PHP-XML module is enabled before using XML functions.
There are a handful of places where we don't check that the XML functions exist before we use them. Ubuntu's PHP 7 packages don't include PHP-XML by default, increasing the chance of this causing issues. Props kraftbj, markoheijnen. Fixes #37122. Built from https://develop.svn.wordpress.org/trunk@38883 git-svn-id: http://core.svn.wordpress.org/trunk@38826 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
efaf9bae66
commit
b21d1cb6e6
|
@ -72,6 +72,11 @@ function endElement($parser, $tagName) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create an XML parser
|
// Create an XML parser
|
||||||
|
if ( ! function_exists( 'xml_parser_create' ) ) {
|
||||||
|
trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
|
||||||
|
wp_die( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
|
||||||
|
}
|
||||||
|
|
||||||
$xml_parser = xml_parser_create();
|
$xml_parser = xml_parser_create();
|
||||||
|
|
||||||
// Set the functions to handle opening and closing tags
|
// Set the functions to handle opening and closing tags
|
||||||
|
|
|
@ -44,6 +44,11 @@ class IXR_Message
|
||||||
|
|
||||||
function parse()
|
function parse()
|
||||||
{
|
{
|
||||||
|
if ( ! function_exists( 'xml_parser_create' ) ) {
|
||||||
|
trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML" ) );
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// first remove the XML declaration
|
// first remove the XML declaration
|
||||||
// merged from WP #10698 - this method avoids the RAM usage of preg_replace on very large messages
|
// merged from WP #10698 - this method avoids the RAM usage of preg_replace on very large messages
|
||||||
$header = preg_replace( '/<\?xml.*?\?'.'>/s', '', substr( $this->message, 0, 100 ), 1 );
|
$header = preg_replace( '/<\?xml.*?\?'.'>/s', '', substr( $this->message, 0, 100 ), 1 );
|
||||||
|
|
|
@ -121,6 +121,11 @@ class AtomParser {
|
||||||
|
|
||||||
array_unshift($this->ns_contexts, array());
|
array_unshift($this->ns_contexts, array());
|
||||||
|
|
||||||
|
if ( ! function_exists( 'xml_parser_create_ns' ) ) {
|
||||||
|
trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
$parser = xml_parser_create_ns();
|
$parser = xml_parser_create_ns();
|
||||||
xml_set_object($parser, $this);
|
xml_set_object($parser, $this);
|
||||||
xml_set_element_handler($parser, "start_element", "end_element");
|
xml_set_element_handler($parser, "start_element", "end_element");
|
||||||
|
|
|
@ -538,6 +538,12 @@ function prep_atom_text_construct($data) {
|
||||||
return array('text', $data);
|
return array('text', $data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( ! function_exists( 'xml_parser_create' ) ) {
|
||||||
|
trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
|
||||||
|
|
||||||
|
return array( 'html', "<![CDATA[$data]]>" );
|
||||||
|
}
|
||||||
|
|
||||||
$parser = xml_parser_create();
|
$parser = xml_parser_create();
|
||||||
xml_parse($parser, '<div>' . $data . '</div>', true);
|
xml_parse($parser, '<div>' . $data . '</div>', true);
|
||||||
$code = xml_get_error_code($parser);
|
$code = xml_get_error_code($parser);
|
||||||
|
|
|
@ -60,15 +60,13 @@ class MagpieRSS {
|
||||||
*/
|
*/
|
||||||
function __construct( $source ) {
|
function __construct( $source ) {
|
||||||
|
|
||||||
# if PHP xml isn't compiled in, die
|
# Check if PHP xml isn't compiled
|
||||||
#
|
#
|
||||||
if ( !function_exists('xml_parser_create') )
|
if ( ! function_exists('xml_parser_create') ) {
|
||||||
trigger_error( "Failed to load PHP's XML Extension. https://secure.php.net/manual/en/ref.xml.php" );
|
return trigger_error( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." );
|
||||||
|
}
|
||||||
|
|
||||||
$parser = @xml_parser_create();
|
$parser = xml_parser_create();
|
||||||
|
|
||||||
if ( !is_resource($parser) )
|
|
||||||
trigger_error( "Failed to create an instance of PHP's XML parser. https://secure.php.net/manual/en/ref.xml.php");
|
|
||||||
|
|
||||||
$this->parser = $parser;
|
$this->parser = $parser;
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '4.7-alpha-38882';
|
$wp_version = '4.7-alpha-38883';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
|
Loading…
Reference in New Issue