Fix template-included categories from 'leaking' from older revisions when cascading...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 00256b8..ec1106e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -258,6 +258,7 @@ The following extensions are migrated into MediaWiki 1.14:
 * (bug 15869) Nostalgia skin does not show page title in printable mode
 * (bug 15795) Special:Userrights is now listed on Special:SpecialPages when the
   user can only his rights
+* (bug 15846) Categories "leak" from older revisions in certain circumstances
 
 === API changes in 1.14 ===
 

diff --git a/includes/Article.php b/includes/Article.php
index 69f1fe9..a142d50 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -3522,7 +3522,7 @@ class Article {
                        $wgUseFileCache = false;
                }
 
-               if ( !wfReadOnly() && $this->mTitle->areRestrictionsCascading() ) {
+               if ( $this->isCurrent() && !wfReadOnly() && $this->mTitle->areRestrictionsCascading() ) {
                        // templatelinks table may have become out of sync,
                        // especially if using variable-based transclusions.
                        // For paranoia, check if things have changed and if