X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FFileDeleteForm.php;h=5aa6edf879c7029bdd6a1c0fff8b3e4587d8b856;hp=3e0595ebe4fb5dae884dc6872fac15d0e413f66b;hb=e73328601d51674e8fef89c3db12b30ceafd702f;hpb=07bb67286b87ee8fbe0325264b63d11be48de765 diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php index 3e0595ebe4..5aa6edf879 100644 --- a/includes/FileDeleteForm.php +++ b/includes/FileDeleteForm.php @@ -229,7 +229,6 @@ class FileDeleteForm { $lbFactory->rollbackMasterChanges( __METHOD__ ); } } else { - // Done; nothing changed $dbw->endAtomic( __METHOD__ ); } } @@ -247,9 +246,6 @@ class FileDeleteForm { private function showForm() { global $wgOut, $wgUser, $wgRequest; - $conf = RequestContext::getMain()->getConfig(); - $oldCommentSchema = $conf->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD; - $wgOut->addModules( 'mediawiki.action.delete.file' ); $checkWatch = $wgUser->getBoolOption( 'watchdeletion' ) || $wgUser->isWatched( $this->title ); @@ -283,13 +279,13 @@ class FileDeleteForm { // HTML maxlength uses "UTF-16 code units", which means that characters outside BMP // (e.g. emojis) count for two each. This limit is overridden in JS to instead count - // Unicode codepoints (or 255 UTF-8 bytes for old schema). + // Unicode codepoints. $fields[] = new OOUI\FieldLayout( new OOUI\TextInputWidget( [ 'name' => 'wpReason', 'inputId' => 'wpReason', 'tabIndex' => 2, - 'maxLength' => $oldCommentSchema ? 255 : CommentStore::COMMENT_CHARACTER_LIMIT, + 'maxLength' => CommentStore::COMMENT_CHARACTER_LIMIT, 'infusable' => true, 'value' => $wgRequest->getText( 'wpReason' ), 'autofocus' => true,