X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fapi%2FApiDelete.php;h=72bbe004828923f1537b5af6491e91294903cba1;hp=50c24aeca8b5954af8a04ce34ef0f13cb98414cf;hb=d5a7166771613dfe4ed9fb75fa5efeced6134bd1;hpb=b01d54e5981da34bf0ce6856e56d3841d71e8686 diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php index 50c24aeca8..72bbe00482 100644 --- a/includes/api/ApiDelete.php +++ b/includes/api/ApiDelete.php @@ -44,11 +44,13 @@ class ApiDelete extends ApiBase { $params = $this->extractRequestParams(); $pageObj = $this->getTitleOrPageId( $params, 'fromdbmaster' ); - if ( !$pageObj->exists() ) { + $titleObj = $pageObj->getTitle(); + if ( !$pageObj->exists() && + !( $titleObj->getNamespace() == NS_FILE && self::canDeleteFile( $pageObj->getFile() ) ) + ) { $this->dieWithError( 'apierror-missingtitle' ); } - $titleObj = $pageObj->getTitle(); $reason = $params['reason']; $user = $this->getUser(); @@ -128,6 +130,14 @@ class ApiDelete extends ApiBase { return $page->doDeleteArticleReal( $reason, false, 0, true, $error, $user, $tags ); } + /** + * @param File $file + * @return bool + */ + protected static function canDeleteFile( File $file ) { + return $file->exists() && $file->isLocal() && !$file->getRedirected(); + } + /** * @param Page $page Object to work on * @param User $user User doing the action @@ -143,7 +153,7 @@ class ApiDelete extends ApiBase { $title = $page->getTitle(); $file = $page->getFile(); - if ( !$file->exists() || !$file->isLocal() || $file->getRedirected() ) { + if ( !self::canDeleteFile( $file ) ) { return self::delete( $page, $user, $reason, $tags ); } @@ -218,6 +228,6 @@ class ApiDelete extends ApiBase { } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Delete'; + return 'https://www.mediawiki.org/wiki/Special:MyLanguage/API:Delete'; } }