From 3f0b8c88c3be1019cf49e0a984e35f73bcb95820 Mon Sep 17 00:00:00 2001
From: 01tonythomas <01tonythomas@gmail.com>
Date: Sat, 30 Nov 2013 19:28:09 +0530
Subject: [PATCH] Removed 'Disable browser page caching" user preference

It is  a very advanced user preference with little usage and is often misleading.
Updated Release Note.

Bug: 52809
Change-Id: I43f6205df53c7a38717c60a2d7d144307feb58a4
---
 RELEASE-NOTES-1.23                | 1 +
 includes/AjaxResponse.php         | 5 -----
 includes/DefaultSettings.php      | 1 -
 includes/OutputPage.php           | 4 ----
 includes/Preferences.php          | 5 -----
 languages/messages/MessagesEn.php | 1 -
 maintenance/language/messages.inc | 1 -
 7 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 6703f89ed7..89d45d184c 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -96,6 +96,7 @@ changes to languages because of Bugzilla reports.
 * User::getPageRenderingHash() was deprecated since 1.17 and has been removed.
 * The ExpandTemplates extension has been moved into MediaWiki core.
 * (bug 52812) Removed "Disable search suggestions" from Preference.
+* (bug 52809) Removed "Disable browser page caching" from Preference.
 
 == Compatibility ==
 
diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index d5536529e9..037ef9a6a0 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -224,11 +224,6 @@ class AjaxResponse {
 			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 868c64e341..f5e3faf8ed 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4012,7 +4012,6 @@ $wgDefaultUserOptions = array(
 	'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 a0d7e30c97..eac70a30ee 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -687,10 +687,6 @@ class OutputPage extends ContextSource {
 			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 cf4d5c91b5..e4c7a8169f 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -756,11 +756,6 @@ class Preferences {
 				'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 954940ee5b..4f206f467f 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -677,7 +677,6 @@ future releases. Also note that since each list value is wrapped in a unique
 '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 8689dc0c16..1da4b78297 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -48,7 +48,6 @@ $wgMessageStructure = array(
 		'tog-minordefault',
 		'tog-previewontop',
 		'tog-previewonfirst',
-		'tog-nocache',
 		'tog-enotifwatchlistpages',
 		'tog-enotifusertalkpages',
 		'tog-enotifminoredits',
-- 
2.20.1