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

Update WikiPage::doDeleteArticleReal to move user earlier

Browse source 
The old signature is //not// deprecated yet.

Bug: T246738
Change-Id: I162b1d25cb226d78582cdac765a7f3dbc9be2070
This commit is contained in:
DannyS712 2020-03-03 06:44:25 +00:00
parent 05cf8ae216
commit ff7bdd36e0
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
RELEASE-NOTES-1.35
View file

@ -619,6 +619,10 @@ because of Phabricator reports.
* …
=== Other changes in 1.35 ===
* The signature of WikiPage::doDeleteArticleReal was changed to make the user
the second parameter, and the suppression option the third parameter.
Previously, the third parameter was unused. The old signature is still
supported, and is not (yet) deprecated.
* …
== Compatibility ==

27
includes/page/WikiPage.php
View file

@ -2590,14 +2590,16 @@ class WikiPage implements Page, IDBAccessObject {
* Deletes the article with database consistency, writes logs, purges caches
*
* @since 1.19
* @since 1.35 Signature changed, user moved to second parameter to prepare for requiring
* a user to be passed
*
* @param string $reason Delete reason for deletion log
* @param bool $suppress Suppress all revisions and log the deletion in
* @param user|bool $user The deleting user
* @param bool|null $suppress Suppress all revisions and log the deletion in
* the suppression log instead of the deletion log
* @param int|null $u1 Unused
* @param bool|null $u2 Unused
* @param array|string &$error Array of errors to append to
* @param User|null $deleter The deleting user
* @param User|null $deleter The deleting user in the old signature, unused in the new
* @param array $tags Tags to apply to the deletion action
* @param string $logsubtype
* @param bool $immediate false allows deleting over time via the job queue
@ -2608,21 +2610,26 @@ class WikiPage implements Page, IDBAccessObject {
* @throws MWException
*/
public function doDeleteArticleReal(
$reason, $suppress = false, $u1 = null, $u2 = null, &$error = '', User $deleter = null,
$reason, $user = false, $suppress = false, $u2 = null, &$error = '', User $deleter = null,
$tags = [], $logsubtype = 'delete', $immediate = false
) {
global $wgUser;
wfDebug( __METHOD__ . "\n" );
if ( $user instanceof User ) {
$deleter = $user;
} else {
$suppress = $user;
if ( $deleter === null ) {
global $wgUser;
$deleter = $wgUser;
}
}
unset( $user );
$status = Status::newGood();
// Avoid PHP 7.1 warning of passing $this by reference
$wikiPage = $this;
if ( !$deleter ) {
$deleter = $wgUser;
}
if ( !Hooks::run( 'ArticleDelete',
[ &$wikiPage, &$deleter, &$reason, &$error, &$status, $suppress ]
) ) {