From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 29 Oct 2005 06:41:43 +0000 (+0000)
Subject: * (bug 3761) Avoid deprecation warnings in Special:Import
X-Git-Tag: 1.6.0~1273
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=800e915e1600c135e5422a21ed6aca89f0cb4929;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4087548f8e..564e85fcba 100644
--- 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 c36b48bb70..ef736617ca 100644
--- 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" );