Merge "Make a hidden form field to keep the language code"

diff --combined includes/specials/SpecialPageLanguage.php
index 75880d1,3fe66b5..7b75c3f
--- 1/includes/specials/SpecialPageLanguage.php
--- 2/includes/specials/SpecialPageLanguage.php
+++ b/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['language'] = array(
+               $page['languageSelector'] = array(
                        'id' => 'mw-pl-languageselector',
                        'type' => 'select',
                        'options' => $options,
@@@ -83,6 -83,12 +83,12 @@@
                        'default' => $wgLanguageCode
                );
  
+               $page['language'] = array(
+                       'id' => 'mw-pl-languagevalue',
+                       'type' => 'hidden',
+                       'default' => $wgLanguageCode
+               );
+ 
                return $page;
        }
  
@@@ -107,7 -113,7 +113,7 @@@
                // 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 ) {