From 1dc2f02b36d0e41d775089f826fa9a9d20b42f0f Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Wed, 25 Oct 2017 08:42:38 -0700 Subject: [PATCH] Article: Drop partial purge code and constants, deprecated in 1.29 Change-Id: I4f20d823e6c9206121212b8a73ecc28f91e68b45 --- RELEASE-NOTES-1.31 | 2 ++ includes/page/Article.php | 10 ---------- includes/page/WikiPage.php | 18 ------------------ 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31 index fc50897925..042af6e094 100644 --- a/RELEASE-NOTES-1.31 +++ b/RELEASE-NOTES-1.31 @@ -55,6 +55,8 @@ changes to languages because of Phabricator reports. * The OutputPage class constructor now requires a context parameter, (instantiating without context was deprecated in 1.18) * mw.page (deprecated in 1.30) was removed. +* Article::getLastPurgeTimestamp(), WikiPage::getLastPurgeTimestamp(), and the + related WikiPage::PURGE_* constants, deprecated in 1.29, were removed. == Compatibility == MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for diff --git a/includes/page/Article.php b/includes/page/Article.php index b91bd9a88a..da8fe886ab 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -2116,16 +2116,6 @@ class Article implements Page { return $this->mPage->doPurge(); } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::getLastPurgeTimestamp - * @deprecated since 1.29 - */ - public function getLastPurgeTimestamp() { - wfDeprecated( __METHOD__, '1.29' ); - return $this->mPage->getLastPurgeTimestamp(); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::doViewUpdates diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index aa2610536a..146c054cd3 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -88,12 +88,6 @@ class WikiPage implements Page, IDBAccessObject { */ protected $mLinksUpdated = '19700101000000'; - /** @deprecated since 1.29. Added in 1.28 for partial purging, no longer used. */ - const PURGE_CDN_CACHE = 1; - const PURGE_CLUSTER_PCACHE = 2; - const PURGE_GLOBAL_PCACHE = 4; - const PURGE_ALL = 7; - /** * Constructor and clear the article * @param Title $title Reference to a Title object. @@ -1134,18 +1128,6 @@ class WikiPage implements Page, IDBAccessObject { return true; } - /** - * Get the last time a user explicitly purged the page via action=purge - * - * @return string|bool TS_MW timestamp or false - * @since 1.28 - * @deprecated since 1.29. It will always return false. - */ - public function getLastPurgeTimestamp() { - wfDeprecated( __METHOD__, '1.29' ); - return false; - } - /** * Insert a new empty page record for this article. * This *must* be followed up by creating a revision -- 2.20.1