Capitalization fix in memcached setting

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

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 57f857b..b93c7fc 100644 (file)
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -312,7 +312,7 @@ class PreferencesForm {
        function mainPrefsForm( $err ) {
                global $wgUser, $wgOut, $wgLang, $wgContLang, $wgUseDynamicDates, $wgValidSkinNames;
                global $wgAllowRealName, $wgImageLimits;
-               global $wgLanguageNames;
+               global $wgLanguageNames, $wgDisableLangConversion;
 
                $wgOut->setPageTitle( wfMsg( 'preferences' ) );
                $wgOut->setArticleRelated( false );
@@ -390,7 +390,7 @@ class PreferencesForm {
                }
                $wgOut->addHTML("
                <div><label>$yem: <input type='text' name=\"wpUserEmail\" value=\"{$this->mUserEmail}\" size='20' /></label></div>
-               <div><label><input type='checkbox' $emfc value=\"1\" name=\"wpEmailFlag\" /> $emf</label></div>
+               <div><label><input type='checkbox' $emfc value=\"1\" name=\"wpEmailFlag\" />$emf</label></div>
                <div><label>$ynn: <input type='text' name=\"wpNick\" value=\"{$this->mNick}\" size='12' /></label></div>
                <div><label>$yl: <select name=\"wpUserLanguage\">\n");
 
@@ -406,28 +406,28 @@ class PreferencesForm {
                $wgOut->addHtml("</select></label></div>\n" );
 
                /* see if there are multiple language variants to choose from*/
-               $variants = $wgContLang->getVariants();
-               $size=sizeof($variants);
+               if(!$wgDisableLangConversion) {
+                       $variants = $wgContLang->getVariants();
+                       $size=sizeof($variants);
                
-               $variantArray=array();
-               foreach($variants as $v) {
-                       $v = str_replace( '_', '-', strtolower($v));
-                       if($name=$wgLanguageNames[$v]) {
-                               $variantArray[$v] = $name;
+                       $variantArray=array();
+                       foreach($variants as $v) {
+                               $v = str_replace( '_', '-', strtolower($v));
+                               if($name=$wgLanguageNames[$v]) {
+                                       $variantArray[$v] = $name;
+                               }
                        }
-               }
-               $size=sizeof($variantArray);
+                       $size=sizeof($variantArray);
                
-               if(sizeof($variantArray) > 1) {
+                       if(sizeof($variantArray) > 1) {
                        $wgOut->addHtml("
                                <div><label>$yv: <select name=\"wpUserVariant\">\n");
-                       foreach($variantArray as $code => $name) {
-                               $sel = ($code==$this->mUserVariant)? 'selected="selected"' : '';
-                               $wgOut->addHtml("\t<option value=\"$code\" $sel>$code - $name</option>\n");
+                               foreach($variantArray as $code => $name) {
+                                       $sel = ($code==$this->mUserVariant)? 'selected="selected"' : '';
+                                       $wgOut->addHtml("\t<option value=\"$code\" $sel>$code - $name</option>\n");
+                               }
                        }
-                       $wgOut->addHtml("</select></label></div>\n");
                }
-
                # Fields for changing password
                #
                $this->mOldpass = htmlspecialchars( $this->mOldpass );
@@ -526,7 +526,7 @@ class PreferencesForm {
                <legend>$timezone</legend>
                <div><b>$tzServerTime:</b> $nowserver</div>
                <div><b>$ltz:</b> $nowlocal</div>
-               <div><label>$tzo*: <input type='text' name=\"wpHourDiff\" value=\"{$this->mHourDiff}\" size='6' /></label></div>
+               <div><label>$tzo*: <input type='text' name=\"wpHourDiff\" value=\"" . htmlspecialchars( $this->mHourDiff ) . "\" size='6' /></label></div>
                <div><input type=\"button\" value=\"$tzGuess\" onclick=\"javascript:guessTimezone()\" id=\"guesstimezonebutton\" style=\"display:none\" /></div>
                <div class='prefsectiontip'>* {$tzt}</div>
        </fieldset>\n\n" );