Added placeholders for text injection by hooks to EditPage.php

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

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index ba93e87..ec1a957 100644 (file)
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -328,7 +328,7 @@ class PreferencesForm {
                }
 
                if( $needRedirect && $error === false ) {
-                       $title =& Title::makeTitle( NS_SPECIAL, "Preferences" );
+                       $title =& SpecialPage::getTitleFor( "Preferences" );
                        $wgOut->redirect($title->getFullURL('success'));
                        return;
                }
@@ -478,7 +478,7 @@ class PreferencesForm {
                $dateopts = $wgLang->getDatePreferences();
                $togs = User::getToggles();
 
-               $titleObj = Title::makeTitle( NS_SPECIAL, 'Preferences' );
+               $titleObj = SpecialPage::getTitleFor( 'Preferences' );
                $action = $titleObj->escapeLocalURL();
 
                # Pre-expire some toggles so they won't show if disabled
@@ -508,7 +508,7 @@ class PreferencesForm {
                                $disableEmailPrefs = true;
                                $skin = $wgUser->getSkin();
                                $emailauthenticated = wfMsg('emailnotauthenticated').'<br />' .
-                                       $skin->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Confirmemail' ),
+                                       $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Confirmemail' ),
                                                wfMsg( 'emailconfirmlink' ) );
                        }
                } else {
@@ -732,12 +732,19 @@ class PreferencesForm {
                # Only show members of Skin::getSkinNames() rather than
                # $skinNames (skins is all skin names from Language.php)
                $validSkinNames = Skin::getSkinNames();
-               foreach ($validSkinNames as $skinkey => $skinname ) {
+               # Sort by UI skin name. First though need to update validSkinNames as sometimes
+               # the skinkey & UI skinname differ (e.g. "standard" skinkey is "Classic" in the UI).
+               foreach ($validSkinNames as $skinkey => & $skinname ) {
+                       if ( isset( $skinNames[$skinkey] ) )  {
+                               $skinname = $skinNames[$skinkey];
+                       }
+               }
+               asort($validSkinNames);
+               foreach ($validSkinNames as $skinkey => $sn ) {
                        if ( in_array( $skinkey, $wgSkipSkins ) ) {
                                continue;
                        }
                        $checked = $skinkey == $this->mSkin ? ' checked="checked"' : '';
-                       $sn = isset( $skinNames[$skinkey] ) ? $skinNames[$skinkey] : $skinname;
 
                        $mplink = htmlspecialchars($mptitle->getLocalURL("useskin=$skinkey"));
                        $previewlink = "<a target='_blank' href=\"$mplink\">$previewtext</a>";
@@ -817,8 +824,7 @@ class PreferencesForm {
                        ) . "<tr><td colspan='2'>
                                <input type='button' value=\"" . wfMsg( 'guesstimezone' ) ."\"
                                onclick='javascript:guessTimezone()' id='guesstimezonebutton' style='display:none;' />
-                               </td></tr></table></fieldset>
-                       <div class='prefsectiontip'>¹" .  wfMsg( 'timezonetext' ) . "</div>
+                               </td></tr></table><div class='prefsectiontip'>¹" .  wfMsg( 'timezonetext' ) . "</div></fieldset>
                </fieldset>\n\n" );
 
                # Editing