Merge "Use `text` element for current content model on Special:ChangeContentModel"

[lhc/web/wiklou.git] / includes / specials / SpecialChangeContentModel.php

diff --git a/includes/specials/SpecialChangeContentModel.php b/includes/specials/SpecialChangeContentModel.php
index bee6a39..184cdbb 100644 (file)
--- a/includes/specials/SpecialChangeContentModel.php
+++ b/includes/specials/SpecialChangeContentModel.php
@@ -106,6 +106,13 @@ class SpecialChangeContentModel extends FormSpecialPage {
                        }
                        $fields['pagetitle']['readonly'] = true;
                        $fields += [
+                               'currentmodel' => [
+                                       'type' => 'text',
+                                       'name' => 'currentcontentmodel',
+                                       'default' => $this->title->getContentModel(),
+                                       'label-message' => 'changecontentmodel-current-label',
+                                       'readonly' => true
+                               ],
                                'model' => [
                                        'type' => 'select',
                                        'name' => 'model',
@@ -154,8 +161,6 @@ class SpecialChangeContentModel extends FormSpecialPage {
        }
 
        public function onSubmit( array $data ) {
-               global $wgContLang;
-
                if ( $data['pagetitle'] === '' ) {
                        // Initial form view of special page, pass
                        return false;
@@ -240,8 +245,6 @@ class SpecialChangeContentModel extends FormSpecialPage {
                if ( $data['reason'] !== '' ) {
                        $reason .= $this->msg( 'colon-separator' )->inContentLanguage()->text() . $data['reason'];
                }
-               # Truncate for whole multibyte characters.
-               $reason = $wgContLang->truncate( $reason, 255 );
 
                // Run edit filters
                $derivativeContext = new DerivativeContext( $this->getContext() );