Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefix new ContentHandler hooks in WikiPage with Page instead of Article

Browse source 
Covers 3 hooks:
* ArticleContentInsertComplete -> PageContentInsertComplete
* ArticleContentSave -> PageContentSave
* ArticleContentSaveComplete -> PageContentSaveComplete

Change-Id: I186669a5941d8982725ed364b481215d291b2043
This commit is contained in:
Siebrand Mazeland 2012-10-11 18:22:52 +02:00
parent a62af2daef
commit 4b62b0339c
12 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/contenthandler.txt
View file

@ -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

12
docs/hooks.txt
View file

@ -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

6
includes/WikiPage.php
View file

@ -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' );

2
languages/LanguageConverter.php
View file

@ -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 ) {

2
languages/classes/LanguageGan.php
View file

@ -116,7 +116,7 @@ class LanguageGan extends LanguageZh {
array(),
$ml );
$wgHooks['ArticleContentSaveComplete'][] = $this->mConverter;
$wgHooks['PageContentSaveComplete'][] = $this->mConverter;
}
/**

2
languages/classes/LanguageIu.php
View file

@ -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;
}
}

2
languages/classes/LanguageKk.php
View file

@ -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;
}
/**

2
languages/classes/LanguageKu.php
View file

@ -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;
}
}

2
languages/classes/LanguageShi.php
View file

@ -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;
}
}

2
languages/classes/LanguageSr.php
View file

@ -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;
}
/**

2
languages/classes/LanguageUz.php
View file

@ -132,6 +132,6 @@ class LanguageUz extends Language {
);
$this->mConverter = new UzConverter( $this, 'uz', $variants, $variantfallbacks );
$wgHooks['ArticleContentSaveComplete'][] = $this->mConverter;
$wgHooks['PageContentSaveComplete'][] = $this->mConverter;
}
}

2
languages/classes/LanguageZh.php
View file

@ -146,7 +146,7 @@ class LanguageZh extends LanguageZh_hans {
array(),
$ml );
$wgHooks['ArticleContentSaveComplete'][] = $this->mConverter;
$wgHooks['PageContentSaveComplete'][] = $this->mConverter;
}
/**