$pageObj = $this->getTitleOrPageId( $params, 'fromdbmaster' );
if ( !$pageObj->exists() ) {
- $this->dieUsageMsg( 'notanarticle' );
+ $this->dieWithError( 'apierror-missingtitle' );
}
$titleObj = $pageObj->getTitle();
$user = $this->getUser();
// Check that the user is allowed to carry out the deletion
- $errors = $titleObj->getUserPermissionsErrors( 'delete', $user );
- if ( count( $errors ) ) {
- $this->dieUsageMsg( $errors[0] );
- }
+ $this->checkTitleUserPermissions( $titleObj, 'delete' );
// If change tagging was requested, check that the user is allowed to tag,
// and the tags are valid
$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->dieUsageMsg( $status[0] );
- }
if ( !$status->isGood() ) {
$this->dieStatus( $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
- * @return Status|array
+ * @param array $tags Tags to tag the deletion with
+ * @return Status
*/
- 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
$hasHistory = false;
$reason = $page->getAutoDeleteReason( $hasHistory );
if ( $reason === false ) {
- return [ [ 'cannotdelete', $title->getPrefixedText() ] ];
+ return Status::newFatal( 'cannotdelete', $title->getPrefixedText() );
}
}
$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
- * @return Status|array
+ * @param array $tags Tags to tag the deletion with
+ * @return Status
*/
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 ) {
if ( !FileDeleteForm::isValidOldSpec( $oldimage ) ) {
- return [ [ 'invalidoldimage' ] ];
+ return Status::newFatal( 'invalidoldimage' );
}
$oldfile = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $title, $oldimage );
if ( !$oldfile->exists() || !$oldfile->isLocal() || $oldfile->getRedirected() ) {
- return [ [ 'nodeleteablefile' ] ];
+ return Status::newFatal( 'nodeleteablefile' );
}
}
$reason = '';
}
- return FileDeleteForm::doDelete( $title, $file, $oldimage, $reason, $suppress, $user );
+ return FileDeleteForm::doDelete( $title, $file, $oldimage, $reason, $suppress, $user, $tags );
}
public function mustBePosted() {