From a1387067295646435fcb4a01bc9b2ca3596498ac Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 8 Oct 2012 14:13:59 +0200 Subject: [PATCH] Fix usage of deprecated ArticleSaveComplete hook in core Change-Id: Ic01fd95d50a909470d6f0ffd93c972322789d49a --- includes/content/ContentHandler.php | 2 +- languages/LanguageConverter.php | 8 ++++---- languages/classes/LanguageGan.php | 2 +- languages/classes/LanguageIu.php | 2 +- languages/classes/LanguageKk.php | 2 +- languages/classes/LanguageKu.php | 2 +- languages/classes/LanguageShi.php | 2 +- languages/classes/LanguageSr.php | 2 +- languages/classes/LanguageUz.php | 2 +- languages/classes/LanguageZh.php | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php index bbc811aaa4..6845255743 100644 --- a/includes/content/ContentHandler.php +++ b/includes/content/ContentHandler.php @@ -973,7 +973,7 @@ abstract class ContentHandler { } if ( $warn ) { - wfWarn( "Using obsolete hook $event" ); + wfWarn( "Using obsolete hook $event via ContentHandler::runLegacyHooks()", 2 ); } // convert Content objects to text diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php index b345f1a56c..8a69799e39 100644 --- a/languages/LanguageConverter.php +++ b/languages/LanguageConverter.php @@ -1039,9 +1039,9 @@ class LanguageConverter { * MediaWiki:Conversiontable* is updated. * @private * - * @param $article Article object + * @param $page WikiPage object * @param $user Object: User object for the current user - * @param $text String: article text (?) + * @param $content Content: new page content * @param $summary String: edit summary of the edit * @param $isMinor Boolean: was the edit marked as minor? * @param $isWatch Boolean: did the user watch this page or not? @@ -1050,9 +1050,9 @@ class LanguageConverter { * @param $revision Object: new Revision object or null * @return Boolean: true */ - function OnArticleSaveComplete( $article, $user, $text, $summary, $isMinor, + function OnArticleContentSaveComplete( $page, $user, $content, $summary, $isMinor, $isWatch, $section, $flags, $revision ) { - $titleobj = $article->getTitle(); + $titleobj = $page->getTitle(); if ( $titleobj->getNamespace() == NS_MEDIAWIKI ) { $title = $titleobj->getDBkey(); $t = explode( '/', $title, 3 ); diff --git a/languages/classes/LanguageGan.php b/languages/classes/LanguageGan.php index 14fe92824d..0c8bd226a9 100644 --- a/languages/classes/LanguageGan.php +++ b/languages/classes/LanguageGan.php @@ -116,7 +116,7 @@ class LanguageGan extends LanguageZh { array(), $ml ); - $wgHooks['ArticleSaveComplete'][] = $this->mConverter; + $wgHooks['ArticleContentSaveComplete'][] = $this->mConverter; } /** diff --git a/languages/classes/LanguageIu.php b/languages/classes/LanguageIu.php index 7402b08358..3ff336ba15 100644 --- a/languages/classes/LanguageIu.php +++ b/languages/classes/LanguageIu.php @@ -233,6 +233,6 @@ class LanguageIu extends Language { $flags = array(); $this->mConverter = new IuConverter( $this, 'iu', $variants, $variantfallbacks, $flags ); - $wgHooks['ArticleSaveComplete'][] = $this->mConverter; + $wgHooks['ArticleContentSaveComplete'][] = $this->mConverter; } } diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php index d3d487fed7..a7e5866097 100644 --- a/languages/classes/LanguageKk.php +++ b/languages/classes/LanguageKk.php @@ -440,7 +440,7 @@ class LanguageKk extends LanguageKk_cyrl { $this->mConverter = new KkConverter( $this, 'kk', $variants, $variantfallbacks ); - $wgHooks['ArticleSaveComplete'][] = $this->mConverter; + $wgHooks['ArticleContentSaveComplete'][] = $this->mConverter; } /** diff --git a/languages/classes/LanguageKu.php b/languages/classes/LanguageKu.php index d60f083541..9150663a35 100644 --- a/languages/classes/LanguageKu.php +++ b/languages/classes/LanguageKu.php @@ -273,6 +273,6 @@ class LanguageKu extends LanguageKu_ku { ); $this->mConverter = new KuConverter( $this, 'ku', $variants, $variantfallbacks ); - $wgHooks['ArticleSaveComplete'][] = $this->mConverter; + $wgHooks['ArticleContentSaveComplete'][] = $this->mConverter; } } diff --git a/languages/classes/LanguageShi.php b/languages/classes/LanguageShi.php index 36f34078b5..335d551ec3 100644 --- a/languages/classes/LanguageShi.php +++ b/languages/classes/LanguageShi.php @@ -212,6 +212,6 @@ class LanguageShi extends Language { $flags = array(); $this->mConverter = new ShiConverter( $this, 'shi', $variants, $variantfallbacks, $flags ); - $wgHooks['ArticleSaveComplete'][] = $this->mConverter; + $wgHooks['ArticleContentSaveComplete'][] = $this->mConverter; } } diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php index 5f1110ddcb..b043778cc9 100644 --- a/languages/classes/LanguageSr.php +++ b/languages/classes/LanguageSr.php @@ -246,7 +246,7 @@ class LanguageSr extends LanguageSr_ec { 'W' => 'W', 'реч' => 'W', 'reč' => 'W', 'ријеч' => 'W', 'riječ' => 'W' ); $this->mConverter = new SrConverter( $this, 'sr', $variants, $variantfallbacks, $flags ); - $wgHooks['ArticleSaveComplete'][] = $this->mConverter; + $wgHooks['ArticleContentSaveComplete'][] = $this->mConverter; } /** diff --git a/languages/classes/LanguageUz.php b/languages/classes/LanguageUz.php index d6ddf105c3..2db64a7e4e 100644 --- a/languages/classes/LanguageUz.php +++ b/languages/classes/LanguageUz.php @@ -132,6 +132,6 @@ class LanguageUz extends Language { ); $this->mConverter = new UzConverter( $this, 'uz', $variants, $variantfallbacks ); - $wgHooks['ArticleSaveComplete'][] = $this->mConverter; + $wgHooks['ArticleContentSaveComplete'][] = $this->mConverter; } } diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php index 63f90fd9c0..11cf0cf272 100644 --- a/languages/classes/LanguageZh.php +++ b/languages/classes/LanguageZh.php @@ -146,7 +146,7 @@ class LanguageZh extends LanguageZh_hans { array(), $ml ); - $wgHooks['ArticleSaveComplete'][] = $this->mConverter; + $wgHooks['ArticleContentSaveComplete'][] = $this->mConverter; } /** -- 2.20.1