Commit 9ed6387c authored by Patrick Schmalstig's avatar Patrick Schmalstig
Browse files

Fixed MANTIS-6128 (Deprecation of strings as handlers)

parent d732f05d

sources/breadcrumbs.php

+2 −2
Original line number Diff line number Diff line
@@ -174,8 +174,8 @@ class Breadcrumb_substitution_loader 
        xml_set_object($xml_parser, $this);

        @xml_parser_set_option($xml_parser, XML_OPTION_TARGET_ENCODING, get_charset());

        @xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 0);

        xml_set_element_handler($xml_parser, 'startElement', 'endElement');

        xml_set_character_data_handler($xml_parser, 'startText');

        xml_set_element_handler($xml_parser, [$this, 'startElement'], [$this, 'endElement']);

        xml_set_character_data_handler($xml_parser, [$this, 'startText']);



        // Run the parser

        if (@xml_parse($xml_parser, $data, true) == 0) {

sources/input_filter.php

+4 −4
Original line number Diff line number Diff line
@@ -703,8 +703,8 @@ class Field_restriction_loader 
        }

        xml_set_object($xml_parser, $this);

        @xml_parser_set_option($xml_parser, XML_OPTION_TARGET_ENCODING, get_charset());

        xml_set_element_handler($xml_parser, 'startElement', 'endElement');

        xml_set_character_data_handler($xml_parser, 'startText');

        xml_set_element_handler($xml_parser, [$this, 'startElement'], [$this, 'endElement']);

        xml_set_character_data_handler($xml_parser, [$this, 'startText']);



        // Run the parser

        $data = cms_file_get_contents_safe(is_file(get_custom_file_base() . '/data_custom/xml_config/fields.xml') ? (get_custom_file_base() . '/data_custom/xml_config/fields.xml') : (get_file_base() . '/data/xml_config/fields.xml'), FILE_READ_LOCK | FILE_READ_BOM);
@@ -947,8 +947,8 @@ class Advanced_banning_loader 
        $xml_parser = xml_parser_create(get_charset());

        xml_set_object($xml_parser, $this);

        @xml_parser_set_option($xml_parser, XML_OPTION_TARGET_ENCODING, get_charset());

        xml_set_element_handler($xml_parser, 'startElement', 'endElement');

        xml_set_character_data_handler($xml_parser, 'startText');

        xml_set_element_handler($xml_parser, [$this, 'startElement'], [$this, 'endElement']);

        xml_set_character_data_handler($xml_parser, [$this, 'startText']);



        // Run the parser

        $data = cms_file_get_contents_safe(is_file(get_custom_file_base() . '/data_custom/xml_config/advanced_banning.xml') ? (get_custom_file_base() . '/data_custom/xml_config/advanced_banning.xml') : (get_file_base() . '/data/xml_config/advanced_banning.xml'), FILE_READ_LOCK | FILE_READ_BOM);

sources/rss.php

+5 −5
Original line number Diff line number Diff line
@@ -135,11 +135,11 @@ class CMS_RSS 
            }

            xml_set_object($xml_parser, $this);

            @xml_parser_set_option($xml_parser, XML_OPTION_TARGET_ENCODING, $target_charset);

            xml_set_element_handler($xml_parser, 'startElement', 'endElement');

            xml_set_character_data_handler($xml_parser, 'startText');

            //xml_set_external_entity_ref_handler($xml_parser, 'extEntity');

            xml_set_start_namespace_decl_handler($xml_parser, 'startNamespace');

            xml_set_end_namespace_decl_handler($xml_parser, 'endNameSpace');

            xml_set_element_handler($xml_parser, [$this, 'startElement'], [$this, 'endElement']);

            xml_set_character_data_handler($xml_parser, [$this, 'startText']);

            //xml_set_external_entity_ref_handler($xml_parser, [$this, 'extEntity']);

            xml_set_start_namespace_decl_handler($xml_parser, [$this, 'startNamespace']);

            xml_set_end_namespace_decl_handler($xml_parser, [$this, 'endNameSpace']);



            /*

            require_code('character_sets');

sources/xml.php

+2 −2
Original line number Diff line number Diff line
@@ -173,8 +173,8 @@ class CMS_simple_xml_reader 
        xml_set_object($xml_parser, $this);

        @xml_parser_set_option($xml_parser, XML_OPTION_TARGET_ENCODING, get_charset());

        xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 0); // Preserve element name case

        xml_set_element_handler($xml_parser, 'startElement', 'endElement');

        xml_set_character_data_handler($xml_parser, 'startText');

        xml_set_element_handler($xml_parser, [$this, 'startElement'], [$this, 'endElement']);

        xml_set_character_data_handler($xml_parser, [$this, 'startText']);



        if (strpos($xml_data, '<' . '?xml') === false) {

            $xml_data = '<' . '?xml version="1.0" encoding="' . xmlentities(get_charset()) . '"?' . '>' . $xml_data;