* (bug 3761) Avoid deprecation warnings in Special:Import

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4087548..564e85f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -192,6 +192,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * Avoid numerous redundant latest-revision lookups in history
 * Ability to set the table name for external storage servers
 * (bug 3667) Add missing global in page move code
+* (bug 3761) Avoid deprecation warnings in Special:Import
 
 
 === Caveats ===

diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php
index c36b48b..ef73661 100644 (file)
--- a/includes/SpecialImport.php
+++ b/includes/SpecialImport.php
@@ -267,7 +267,7 @@ class WikiImporter {
                # case folding violates XML standard, turn it off
                xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, false );
                
-               xml_set_object( $parser, &$this );
+               xml_set_object( $parser, $this );
                xml_set_element_handler( $parser, "in_start", "" );
                
                $offset = 0; // for context extraction on error reporting
@@ -522,9 +522,8 @@ class WikiImporter {
                }
                xml_set_element_handler( $parser, "in_page", "out_page" );
                
-               $out = call_user_func( $this->mRevisionCallback,
-                       &$this->workRevision,
-                       &$this );
+               $out = call_user_func_array( $this->mRevisionCallback,
+                       array( &$this->workRevision, &$this ) );
                if( !empty( $out ) ) {
                        global $wgOut;
                        $wgOut->addHTML( "<li>" . $out . "</li>\n" );