X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FFileDeleteForm.php;h=783de1c0c4cb6d2200e59ccd6f7c4ad6f2e8ac74;hb=d8a7ad14407ec47a0d8197f1ac77b5db3c4a9104;hp=8a1cd352975ed1948c531c8dceee50ddbffb60b7;hpb=5ff347bb044057d3cc560e860c85af26163bc979;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index 8a1cd35297..783de1c0c4 100644
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -143,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
@@ -246,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 = "<tr id=\"wpDeleteSuppressRow\">
 					<td></td>
@@ -258,6 +261,8 @@ class FileDeleteForm {
 			$suppress = '';
 		}
 
+		$wgOut->addModules( 'mediawiki.action.delete.file' );
+
 		$checkWatch = $wgUser->getBoolOption( 'watchdeletion' ) || $wgUser->isWatched( $this->title );
 		$form = Xml::openElement( 'form', [ 'method' => 'post', 'action' => $this->getAction(),
 			'id' => 'mw-img-deleteconfirm' ] ) .
@@ -286,8 +291,15 @@ class FileDeleteForm {
 					Xml::label( wfMessage( 'filedelete-otherreason' )->text(), 'wpReason' ) .
 				"</td>
 				<td class='mw-input'>" .
-					Xml::input( 'wpReason', 60, $wgRequest->getText( 'wpReason' ),
-						[ 'type' => 'text', 'maxlength' => '255', 'tabindex' => '2', 'id' => 'wpReason' ] ) .
+					Xml::input( 'wpReason', 60, $wgRequest->getText( 'wpReason' ), [
+						'type' => 'text',
+						// 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).
+						'maxlength' => $oldCommentSchema ? 255 : CommentStore::COMMENT_CHARACTER_LIMIT,
+						'tabindex' => '2',
+						'id' => 'wpReason'
+					] ) .
 				"</td>
 			</tr>
 			{$suppress}";
@@ -398,8 +410,8 @@ class FileDeleteForm {
 	 * value was provided, does it correspond to an
 	 * existing, local, old version of this file?
 	 *
-	 * @param File $file
-	 * @param File $oldfile
+	 * @param File &$file
+	 * @param File &$oldfile
 	 * @param File $oldimage
 	 * @return bool
 	 */