dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Encapsulate rc_params handling in RecentChange::parseParams
[lhc/web/wiklou.git]
/
includes
/
Preferences.php
diff --git
a/includes/Preferences.php
b/includes/Preferences.php
index
84d4189
..
9b0ada8
100644
(file)
--- a/
includes/Preferences.php
+++ b/
includes/Preferences.php
@@
-657,8
+657,9
@@
class Preferences {
$now = wfTimestampNow();
$lang = $context->getLanguage();
$nowlocal = Xml::element( 'span', array( 'id' => 'wpLocalTime' ),
$now = wfTimestampNow();
$lang = $context->getLanguage();
$nowlocal = Xml::element( 'span', array( 'id' => 'wpLocalTime' ),
- $lang->time( $now, true ) );
- $nowserver = $lang->time( $now, false ) .
+ $lang->userTime( $now, $user ) );
+ $nowserver = $lang->userTime( $now, $user,
+ array( 'format' => false, 'timecorrection' => false ) ) .
Html::hidden( 'wpServerTime', (int)substr( $now, 8, 2 ) * 60 + (int)substr( $now, 10, 2 ) );
$defaultPreferences['nowserver'] = array(
Html::hidden( 'wpServerTime', (int)substr( $now, 8, 2 ) * 60 + (int)substr( $now, 10, 2 ) );
$defaultPreferences['nowserver'] = array(
@@
-893,6
+894,9
@@
class Preferences {
'section' => 'rc/advancedrc',
'label-message' => 'tog-hidepatrolled',
);
'section' => 'rc/advancedrc',
'label-message' => 'tog-hidepatrolled',
);
+ }
+
+ if ( $user->useNPPatrol() ) {
$defaultPreferences['newpageshidepatrolled'] = array(
'type' => 'toggle',
'section' => 'rc/advancedrc',
$defaultPreferences['newpageshidepatrolled'] = array(
'type' => 'toggle',
'section' => 'rc/advancedrc',
@@
-991,7
+995,7
@@
class Preferences {
'label-message' => 'tog-watchlisthideliu',
);
'label-message' => 'tog-watchlisthideliu',
);
- if ( $
context->getConfig()->get( 'UseRCPatrol'
) ) {
+ if ( $
user->useRCPatrol(
) ) {
$defaultPreferences['watchlisthidepatrolled'] = array(
'type' => 'toggle',
'section' => 'watchlist/advancedwatchlist',
$defaultPreferences['watchlisthidepatrolled'] = array(
'type' => 'toggle',
'section' => 'watchlist/advancedwatchlist',
@@
-1094,7
+1098,7
@@
class Preferences {
$linkTools = array();
# Mark the default skin
$linkTools = array();
# Mark the default skin
- if (
$skinkey == $defaultSkin
) {
+ if (
strcasecmp( $skinkey, $defaultSkin ) === 0
) {
$linkTools[] = $context->msg( 'default' )->escaped();
$foundDefault = true;
}
$linkTools[] = $context->msg( 'default' )->escaped();
$foundDefault = true;
}