Merge "Remove old Title CSS/JS methods, deprecated in 1.31, unused"

[lhc/web/wiklou.git] / includes / ProtectionForm.php

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index bb8eba1..c677a09 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -355,7 +355,6 @@ class ProtectionForm {
                $lang = $context->getLanguage();
                $conf = $context->getConfig();
                $cascadingRestrictionLevels = $conf->get( 'CascadingRestrictionLevels' );
-               $oldCommentSchema = $conf->get( 'CommentTableSchemaMigrationStage' ) === MIGRATION_OLD;
                $out = '';
                if ( !$this->disabled ) {
                        $output->addModules( 'mediawiki.legacy.protect' );
@@ -502,10 +501,10 @@ class ProtectionForm {
 
                        // 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 180 UTF-8 bytes for old schema).
+                       // Unicode codepoints.
                        // Subtract arbitrary 75 to leave some space for the autogenerated null edit's summary
                        // and other texts chosen by dropdown menus on this page.
-                       $maxlength = $oldCommentSchema ? 180 : CommentStore::COMMENT_CHARACTER_LIMIT - 75;
+                       $maxlength = CommentStore::COMMENT_CHARACTER_LIMIT - 75;
 
                        $out .= Xml::openElement( 'table', [ 'id' => 'mw-protect-table3' ] ) .
                                Xml::openElement( 'tbody' );
@@ -627,7 +626,7 @@ class ProtectionForm {
         * Show protection long extracts for this page
         *
         * @param OutputPage &$out
-        * @access private
+        * @private
         */
        function showLogExtract( &$out ) {
                # Show relevant lines from the protection log: