From 4b62b0339cf81868e5606650f92ebaf65d14c6da Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 11 Oct 2012 18:22:52 +0200 Subject: [PATCH] Prefix new ContentHandler hooks in WikiPage with Page instead of Article Covers 3 hooks: * ArticleContentInsertComplete -> PageContentInsertComplete * ArticleContentSave -> PageContentSave * ArticleContentSaveComplete -> PageContentSaveComplete Change-Id: I186669a5941d8982725ed364b481215d291b2043 --- docs/contenthandler.txt | 6 +++--- docs/hooks.txt | 12 ++++++------ includes/WikiPage.php | 6 +++--- languages/LanguageConverter.php | 2 +- 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 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/contenthandler.txt b/docs/contenthandler.txt index 35614328a2..5a63460eb9 100644 --- a/docs/contenthandler.txt +++ b/docs/contenthandler.txt @@ -115,9 +115,9 @@ Besides some functions, some hooks have also been replaced by new versions (see These hooks will now trigger a warning when used: * ArticleAfterFetchContent was replaced by ArticleAfterFetchContentObject -* ArticleInsertComplete was replaced by ArticleContentInsertComplete -* ArticleSave was replaced by ArticleContentSave -* ArticleSaveComplete was replaced by ArticleContentSaveComplete +* ArticleInsertComplete was replaced by PageContentInsertComplete +* ArticleSave was replaced by PageContentSave +* ArticleSaveComplete was replaced by PageContentSaveComplete * ArticleViewCustom was replaced by ArticleContentViewCustom (also consider a custom implementation of the view action) * EditFilterMerged was replaced by EditFilterMergedContent * EditPageGetDiffText was replaced by EditPageGetDiffContent diff --git a/docs/hooks.txt b/docs/hooks.txt index a4b4e571f9..7957c84b0c 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -491,7 +491,7 @@ Wiki::articleFromTitle() $title: title (object) used to create the article object $article: article (object) that will be returned -'ArticleInsertComplete': After a new article is created. DEPRECATED, use ArticleContentInsertComplete +'ArticleInsertComplete': After a new article is created. DEPRECATED, use PageContentInsertComplete $article: WikiPage created $user: User creating the article $text: New content @@ -502,7 +502,7 @@ $section: (No longer used) $flags: Flags passed to WikiPage::doEditContent() $revision: New Revision of the article -'ArticleContentInsertComplete': After a new article is created +'PageContentInsertComplete': After a new article is created $article: WikiPage created $user: User creating the article $content: New content as a Content object @@ -561,7 +561,7 @@ $user: the user who did the rollback $revision: the revision the page was reverted back to $current: the reverted revision -'ArticleSave': before an article is saved. DEPRECATED, use ArticleContentSave instead +'ArticleSave': before an article is saved. DEPRECATED, use PageContentSave instead $article: the WikiPage (object) being saved $user: the user (object) saving the article $text: the new article text @@ -570,7 +570,7 @@ $isminor: minor flag $iswatch: watch flag $section: section # -'ArticleContentSave': before an article is saved. +'PageContentSave': before an article is saved. $article: the WikiPage (object) being saved $user: the user (object) saving the article $content: the new article content, as a Content object @@ -579,7 +579,7 @@ $isminor: minor flag $iswatch: watch flag $section: section # -'ArticleSaveComplete': After an article has been updated. DEPRECATED, use ArticleContentSaveComplete instead. +'ArticleSaveComplete': After an article has been updated. DEPRECATED, use PageContentSaveComplete instead. $article: WikiPage modified $user: User performing the modification $text: New content @@ -592,7 +592,7 @@ $revision: New Revision of the article $status: Status object about to be returned by doEditContent() $baseRevId: the rev ID (or false) this edit was based on -'ArticleContentSaveComplete': After an article has been updated +'PageContentSaveComplete': After an article has been updated $article: WikiPage modified $user: User performing the modification $content: New content, as a Content object diff --git a/includes/WikiPage.php b/includes/WikiPage.php index 770c37a2a4..f79c249dd0 100644 --- a/includes/WikiPage.php +++ b/includes/WikiPage.php @@ -1647,7 +1647,7 @@ class WikiPage extends Page implements IDBAccessObject { $hook_args = array( &$this, &$user, &$content, &$summary, $flags & EDIT_MINOR, null, null, &$flags, &$status ); - if ( !wfRunHooks( 'ArticleContentSave', $hook_args ) + if ( !wfRunHooks( 'PageContentSave', $hook_args ) || !ContentHandler::runLegacyHooks( 'ArticleSave', $hook_args ) ) { wfDebug( __METHOD__ . ": ArticleSave or ArticleSaveContent hook aborted save!\n" ); @@ -1878,7 +1878,7 @@ class WikiPage extends Page implements IDBAccessObject { $flags & EDIT_MINOR, null, null, &$flags, $revision ); ContentHandler::runLegacyHooks( 'ArticleInsertComplete', $hook_args ); - wfRunHooks( 'ArticleContentInsertComplete', $hook_args ); + wfRunHooks( 'PageContentInsertComplete', $hook_args ); } # Do updates right now unless deferral was requested @@ -1893,7 +1893,7 @@ class WikiPage extends Page implements IDBAccessObject { $flags & EDIT_MINOR, null, null, &$flags, $revision, &$status, $baseRevId ); ContentHandler::runLegacyHooks( 'ArticleSaveComplete', $hook_args ); - wfRunHooks( 'ArticleContentSaveComplete', $hook_args ); + wfRunHooks( 'PageContentSaveComplete', $hook_args ); # Promote user to any groups they meet the criteria for $user->addAutopromoteOnceGroups( 'onEdit' ); diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php index 09e850e032..601660591b 100644 --- a/languages/LanguageConverter.php +++ b/languages/LanguageConverter.php @@ -1071,7 +1071,7 @@ class LanguageConverter { * @param $revision Object: new Revision object or null * @return Boolean: true */ - function OnArticleContentSaveComplete( $page, $user, $content, $summary, $isMinor, + function OnPageContentSaveComplete( $page, $user, $content, $summary, $isMinor, $isWatch, $section, $flags, $revision ) { $titleobj = $page->getTitle(); if ( $titleobj->getNamespace() == NS_MEDIAWIKI ) { diff --git a/languages/classes/LanguageGan.php b/languages/classes/LanguageGan.php index 0c8bd226a9..6482070d08 100644 --- a/languages/classes/LanguageGan.php +++ b/languages/classes/LanguageGan.php @@ -116,7 +116,7 @@ class LanguageGan extends LanguageZh { array(), $ml ); - $wgHooks['ArticleContentSaveComplete'][] = $this->mConverter; + $wgHooks['PageContentSaveComplete'][] = $this->mConverter; } /** diff --git a/languages/classes/LanguageIu.php b/languages/classes/LanguageIu.php index 3ff336ba15..79e5582634 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['ArticleContentSaveComplete'][] = $this->mConverter; + $wgHooks['PageContentSaveComplete'][] = $this->mConverter; } } diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php index a7e5866097..bdaf2f4f14 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['ArticleContentSaveComplete'][] = $this->mConverter; + $wgHooks['PageContentSaveComplete'][] = $this->mConverter; } /** diff --git a/languages/classes/LanguageKu.php b/languages/classes/LanguageKu.php index 9150663a35..0eac439bd2 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['ArticleContentSaveComplete'][] = $this->mConverter; + $wgHooks['PageContentSaveComplete'][] = $this->mConverter; } } diff --git a/languages/classes/LanguageShi.php b/languages/classes/LanguageShi.php index 335d551ec3..4833d1c330 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['ArticleContentSaveComplete'][] = $this->mConverter; + $wgHooks['PageContentSaveComplete'][] = $this->mConverter; } } diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php index b043778cc9..b472743630 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['ArticleContentSaveComplete'][] = $this->mConverter; + $wgHooks['PageContentSaveComplete'][] = $this->mConverter; } /** diff --git a/languages/classes/LanguageUz.php b/languages/classes/LanguageUz.php index 2db64a7e4e..a2c917cda5 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['ArticleContentSaveComplete'][] = $this->mConverter; + $wgHooks['PageContentSaveComplete'][] = $this->mConverter; } } diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php index 11cf0cf272..8bf66a30c1 100644 --- a/languages/classes/LanguageZh.php +++ b/languages/classes/LanguageZh.php @@ -146,7 +146,7 @@ class LanguageZh extends LanguageZh_hans { array(), $ml ); - $wgHooks['ArticleContentSaveComplete'][] = $this->mConverter; + $wgHooks['PageContentSaveComplete'][] = $this->mConverter; } /** -- 2.20.1