Fix usage of deprecated ArticleSaveComplete hook in core

Change-Id: Ic01fd95d50a909470d6f0ffd93c972322789d49a

diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php
index bbc811a..6845255 100644 (file)
--- 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 b345f1a..8a69799 100644 (file)
--- 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 14fe928..0c8bd22 100644 (file)
--- 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 7402b08..3ff336b 100644 (file)
--- 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 d3d487f..a7e5866 100644 (file)
--- 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 d60f083..9150663 100644 (file)
--- 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 36f3407..335d551 100644 (file)
--- 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 5f1110d..b043778 100644 (file)
--- 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 d6ddf10..2db64a7 100644 (file)
--- 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 63f90fd..11cf0cf 100644 (file)
--- 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;
        }
 
        /**