Merge "Revert "Make a hidden form field to keep the language code""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 27 Jul 2014 14:56:27 +0000 (14:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 27 Jul 2014 14:56:27 +0000 (14:56 +0000)
1  2 
includes/specials/SpecialPageLanguage.php

@@@ -30,7 -30,7 +30,7 @@@
   */
  class SpecialPageLanguage extends FormSpecialPage {
        /**
 -       * @var $goToUrl URL to go to if language change successful
 +       * @var string URL to go to if language change successful
         */
        private $goToUrl;
  
@@@ -75,7 -75,7 +75,7 @@@
                        $options["$code - $name"] = $code;
                }
  
-               $page['languageSelector'] = array(
+               $page['language'] = array(
                        'id' => 'mw-pl-languageselector',
                        'type' => 'select',
                        'options' => $options,
                        'default' => $wgLanguageCode
                );
  
-               $page['language'] = array(
-                       'id' => 'mw-pl-languagevalue',
-                       'type' => 'hidden',
-                       'default' => $wgLanguageCode
-               );
                return $page;
        }
  
 +      protected function postText() {
 +              return $this->showLogFragment( $this->par );
 +      }
 +
        public function alterForm( HTMLForm $form ) {
                $form->setDisplayFormat( 'vform' );
                $form->setWrapperLegend( false );
                // Returns the default since the page is not loaded from DB
                $defLang = $title->getPageLanguage()->getCode();
  
 -              $pageId =  $title->getArticleID();
 +              $pageId = $title->getArticleID();
  
                // Check if article exists
                if ( !$pageId ) {
                // Success causes a redirect
                $this->getOutput()->redirect( $this->goToUrl );
        }
 +
 +      function showLogFragment( $title ) {
 +              $moveLogPage = new LogPage( 'pagelang' );
 +              $out1 = Xml::element( 'h2', null, $moveLogPage->getName()->text() );
 +              $out2 = '';
 +              LogEventsList::showLogExtract( $out2, 'pagelang', $title );
 +              return $out1 . $out2;
 +      }
  }