Merge "Removed 'Disable browser page caching" user preference"

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 7b6a07f..81ac4cd 100644 (file)
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -103,6 +103,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 d553652..037ef9a 100644 (file)
--- 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 5163e80..40f943f 100644 (file)
--- 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 a0d7e30..eac70a3 100644 (file)
--- 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 cf4d5c9..e4c7a81 100644 (file)
--- 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 4ec3ee8..4894bf5 100644 (file)
--- 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 40bc31d..e08c4f4 100644 (file)
--- 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',