* @param string $reason Reason of the deletion
* @param bool $suppress Whether to mark all deleted versions as restricted
* @param User $user User object performing the request
+ * @param array $tags Tags to apply to the deletion action
* @throws MWException
* @return bool|Status
*/
public static function doDelete( &$title, &$file, &$oldimage, $reason,
- $suppress, User $user = null
+ $suppress, User $user = null, $tags = []
) {
if ( $user === null ) {
global $wgUser;
$logEntry->setPerformer( $user );
$logEntry->setTarget( $title );
$logEntry->setComment( $logComment );
+ $logEntry->setTags( $tags );
$logid = $logEntry->insert();
$logEntry->publish( $logid );
$dbw->startAtomic( __METHOD__ );
// delete the associated article first
$error = '';
- $deleteStatus = $page->doDeleteArticleReal( $reason, $suppress, 0, false, $error, $user );
+ $deleteStatus = $page->doDeleteArticleReal( $reason, $suppress, 0, false, $error,
+ $user, $tags );
// doDeleteArticleReal() returns a non-fatal error status if the page
// or revision is missing, so check for isOK() rather than isGood()
if ( $deleteStatus->isOK() ) {
$user,
$params['oldimage'],
$reason,
- false
+ false,
+ $params['tags']
);
} else {
- $status = self::delete( $pageObj, $user, $reason );
+ $status = self::delete( $pageObj, $user, $reason, $params['tags'] );
}
if ( is_array( $status ) ) {
}
$this->setWatch( $watch, $titleObj, 'watchdeletion' );
- // Apply change tags to the log entry, if requested
- if ( count( $params['tags'] ) ) {
- ChangeTags::addTags( $params['tags'], null, null, $status->value, null );
- }
-
$r = [
'title' => $titleObj->getPrefixedText(),
'reason' => $reason,
* @param Page|WikiPage $page Page or WikiPage object to work on
* @param User $user User doing the action
* @param string|null $reason Reason for the deletion. Autogenerated if null
+ * @param array $tags Tags to tag the deletion with
* @return Status|array
*/
- protected static function delete( Page $page, User $user, &$reason = null ) {
+ protected static function delete( Page $page, User $user, &$reason = null, $tags = [] ) {
$title = $page->getTitle();
// Auto-generate a summary, if necessary
$error = '';
// Luckily, Article.php provides a reusable delete function that does the hard work for us
- return $page->doDeleteArticleReal( $reason, false, 0, true, $error, $user );
+ return $page->doDeleteArticleReal( $reason, false, 0, true, $error, $user, $tags );
}
/**
* @param string $oldimage Archive name
* @param string $reason Reason for the deletion. Autogenerated if null.
* @param bool $suppress Whether to mark all deleted versions as restricted
+ * @param array $tags Tags to tag the deletion with
* @return Status|array
*/
protected static function deleteFile( Page $page, User $user, $oldimage,
- &$reason = null, $suppress = false
+ &$reason = null, $suppress = false, $tags = []
) {
$title = $page->getTitle();
$file = $page->getFile();
if ( !$file->exists() || !$file->isLocal() || $file->getRedirected() ) {
- return self::delete( $page, $user, $reason );
+ return self::delete( $page, $user, $reason, $tags );
}
if ( $oldimage ) {
$reason = '';
}
- return FileDeleteForm::doDelete( $title, $file, $oldimage, $reason, $suppress, $user );
+ return FileDeleteForm::doDelete( $title, $file, $oldimage, $reason, $suppress, $user, $tags );
}
public function mustBePosted() {
* @see WikiPage::doDeleteArticleReal
*/
public function doDeleteArticleReal(
- $reason, $suppress = false, $u1 = null, $u2 = null, &$error = '', User $user = null
+ $reason, $suppress = false, $u1 = null, $u2 = null, &$error = '', User $user = null,
+ $tags = []
) {
return $this->mPage->doDeleteArticleReal(
- $reason, $suppress, $u1, $u2, $error, $user
+ $reason, $suppress, $u1, $u2, $error, $user, $tags
);
}
* @param bool $u2 Unused
* @param array|string &$error Array of errors to append to
* @param User $user The deleting user
+ * @param array $tags Tags to apply to the deletion action
* @return Status Status object; if successful, $status->value is the log_id of the
* deletion log entry. If the page couldn't be deleted because it wasn't
* found, $status is a non-fatal 'cannotdelete' error
*/
public function doDeleteArticleReal(
- $reason, $suppress = false, $u1 = null, $u2 = null, &$error = '', User $user = null
+ $reason, $suppress = false, $u1 = null, $u2 = null, &$error = '', User $user = null,
+ $tags = []
) {
global $wgUser, $wgContentHandlerUseDB;
$logEntry->setPerformer( $user );
$logEntry->setTarget( $logTitle );
$logEntry->setComment( $reason );
+ $logEntry->setTags( $tags );
$logid = $logEntry->insert();
$dbw->onTransactionPreCommitOrIdle(