From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 5 Jan 2015 22:40:15 +0000 (+0000)
Subject: Merge "Proper namespace handling for WikiImporter"
X-Git-Tag: 1.31.0-rc.0~12790
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=958167760104b037db7db0a3c64e248052217759;p=lhc%2Fweb%2Fwiklou.git

Merge "Proper namespace handling for WikiImporter"
---

958167760104b037db7db0a3c64e248052217759
diff --cc includes/Import.php
index daefb8804a,5922c69336..c3caeccffa
--- a/includes/Import.php
+++ b/includes/Import.php
@@@ -326,9 -347,10 +347,10 @@@ class WikiImporter 
  	 * @param array $pageInfo
  	 * @return bool
  	 */
- 	public function finishImportPage( $title, $origTitle, $revCount, $sRevCount, $pageInfo ) {
+ 	public function finishImportPage( $title, $foreignTitle, $revCount,
+ 			$sRevCount, $pageInfo ) {
  		$args = func_get_args();
 -		return wfRunHooks( 'AfterImportPage', $args );
 +		return Hooks::run( 'AfterImportPage', $args );
  	}
  
  	/**