01tonythomas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/97925
Change subject: Removed 'Disable browser page caching" user preference
......................................................................
Removed 'Disable browser page caching" user preference
It is a very advanced user preference with little usage and is often
misleading.
Bug: 52809
Change-Id: I2150c2293a03df80e5ab0b2014e4930120ff5761
---
M includes/AjaxResponse.php
M includes/DefaultSettings.php
M includes/OutputPage.php
M includes/Preferences.php
M languages/messages/MessagesEn.php
M maintenance/language/messages.inc
6 files changed, 0 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/25/97925/1
diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index d553652..037ef9a 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -224,11 +224,6 @@
return false;
}
- if ( $wgUser->getOption( 'nocache' ) ) {
- wfDebug( "$fname: USER DISABLED CACHE\n", false );
- return false;
- }
-
$timestamp = wfTimestamp( TS_MW, $timestamp );
$lastmod = wfTimestamp( TS_RFC2822, max( $timestamp,
$wgUser->getTouched(), $wgCacheEpoch ) );
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2d1ddcb..b10ae45 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3988,7 +3988,6 @@
'math' => 1,
'minordefault' => 0,
'newpageshidepatrolled' => 0,
- 'nocache' => 0,
'noconvertlink' => 0,
'norollbackdiff' => 0,
'numberheadings' => 0,
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index b4fda13..879faca 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -687,10 +687,6 @@
wfDebug( __METHOD__ . ": CACHE DISABLED\n", false );
return false;
}
- if ( $this->getUser()->getOption( 'nocache' ) ) {
- wfDebug( __METHOD__ . ": USER DISABLED CACHE\n", false
);
- return false;
- }
$timestamp = wfTimestamp( TS_MW, $timestamp );
$modifiedTimes = array(
diff --git a/includes/Preferences.php b/includes/Preferences.php
index c9caf4f..f92413a 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -756,11 +756,6 @@
'label-message' => 'tog-showtoc',
);
}
- $defaultPreferences['nocache'] = array(
- 'type' => 'toggle',
- 'label-message' => 'tog-nocache',
- 'section' => 'rendering/advancedrendering',
- );
$defaultPreferences['showhiddencats'] = array(
'type' => 'toggle',
'section' => 'rendering/advancedrendering',
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 2baccf5..7988fd4 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -676,7 +676,6 @@
'tog-minordefault' => 'Mark all edits minor by default',
'tog-previewontop' => 'Show preview before edit box',
'tog-previewonfirst' => 'Show preview on first edit',
-'tog-nocache' => 'Disable browser page caching',
'tog-enotifwatchlistpages' => 'Email me when a page or file on my watchlist
is changed',
'tog-enotifusertalkpages' => 'Email me when my user talk page is changed',
'tog-enotifminoredits' => 'Email me also for minor edits of pages and
files',
diff --git a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index 17658a0..98f3632 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -48,7 +48,6 @@
'tog-minordefault',
'tog-previewontop',
'tog-previewonfirst',
- 'tog-nocache',
'tog-enotifwatchlistpages',
'tog-enotifusertalkpages',
'tog-enotifminoredits',
--
To view, visit https://gerrit.wikimedia.org/r/97925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2150c2293a03df80e5ab0b2014e4930120ff5761
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
