X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FFileDeleteForm.php;h=783de1c0c4cb6d2200e59ccd6f7c4ad6f2e8ac74;hb=aa54a4caa3d592bcae9f44549a46cd655388b79b;hp=e7b4a1f8e61b5c07cc84f839faa24dc7f7568e85;hpb=43a548a5c3436b5d07091b504bbf5eb80d1ed215;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php index e7b4a1f8e6..783de1c0c4 100644 --- a/includes/FileDeleteForm.php +++ b/includes/FileDeleteForm.php @@ -47,8 +47,6 @@ class FileDeleteForm { private $oldimage = ''; /** - * Constructor - * * @param File $file File object we're deleting */ public function __construct( $file ) { @@ -145,9 +143,9 @@ class FileDeleteForm { /** * Really delete the file * - * @param Title $title - * @param File $file - * @param string $oldimage Archive name + * @param Title &$title + * @param File &$file + * @param string &$oldimage Archive name * @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 @@ -248,6 +246,9 @@ class FileDeleteForm { private function showForm() { global $wgOut, $wgUser, $wgRequest; + $conf = RequestContext::getMain()->getConfig(); + $oldCommentSchema = $conf->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD; + if ( $wgUser->isAllowed( 'suppressrevision' ) ) { $suppress = "