From 8ef1df9f60cf9de4db5fe201a4e77bc536697ec4 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sun, 29 Jun 2003 20:24:26 +0000 Subject: [PATCH] Add link to help page from preferences screen (now wiki text, can set appropriately for each language... --- includes/SpecialPreferences.php | 3 +-- languages/Language.php | 10 ++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php index b0aa5da831..48294dd3f0 100644 --- a/includes/SpecialPreferences.php +++ b/includes/SpecialPreferences.php @@ -146,8 +146,7 @@ function wfSpecialPreferences() $uname = $wgUser->getName(); $uid = $wgUser->getID(); - $wgOut->addHTML( "

" . str_replace( array("$1","$2"), array($uname,$uid), - wfMsg( "prefslogintext" ) ) . "\n" ); + $wgOut->addWikiText( wfMsg( "prefslogintext", $uname, $uid ) ); $qbs = $wgLang->getQuickbarSettings(); $skins = $wgLang->getSkinNames(); diff --git a/languages/Language.php b/languages/Language.php index 9c61084805..42579d6bd5 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -596,7 +596,9 @@ $2 List redirects   Search for $3 $9", wfLocalUrl( "Special:Userlogin" ) . "\">logged in to set user preferences.", "prefslogintext" => "You are logged in as \"$1\". -Your internal ID number is $2.", +Your internal ID number is $2. + +See [[Wikipedia:User preferences help]] for help deciphering the options.", "prefsreset" => "Preferences have been reset from storage.", "qbsettings" => "Quickbar settings", "changepassword" => "Change password", @@ -1183,11 +1185,11 @@ class Language { } if ( 0 == $diff ) { return $ts; } - $t = mktime( ( (int)substr( $ts, 8, 2) ) + $diff, + $t = gmmktime( ( (int)substr( $ts, 8, 2) ) + $diff, (int)substr( $ts, 10, 2 ), (int)substr( $ts, 12, 2 ), (int)substr( $ts, 4, 2 ), (int)substr( $ts, 6, 2 ), (int)substr( $ts, 0, 4 ) ); - return date( "YmdHis", $t ); + return gmdate( "YmdHis", $t ); } function date( $ts, $adj = false ) @@ -1222,7 +1224,7 @@ class Language { function rfc1123( $ts ) { - return date( "D, d M Y H:i:s T", $ts ); + return gmdate( "D, d M Y H:i:s T", $ts ); } function getValidSpecialPages() -- 2.20.1