From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 22 Jul 2004 00:05:52 +0000 (+0000)
Subject: File cache fix (typo had reversed one of the checks, and another was no longer quite... 
X-Git-Tag: 1.5.0alpha1~2621
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=3b7f89554a6ced635053d38432ed6ee6db14ea90;p=lhc%2Fweb%2Fwiklou.git

File cache fix (typo had reversed one of the checks, and another was no longer quite right
---

diff --git a/includes/Article.php b/includes/Article.php
index 0fe1352c6d..bfe325a467 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -658,7 +658,7 @@ class Article {
 			return;
 		}
 
-		if ( !is_null( $oldid ) and $this->checkTouched() ) {
+		if ( empty( $oldid ) && $this->checkTouched() ) {
 			if( $wgOut->checkLastModified( $this->mTouched ) ){
 				return;
 			} else if ( $this->tryFileCache() ) {
@@ -1738,7 +1738,7 @@ class Article {
 			and ($wgUser->getId() == 0)
 			and (!$wgUser->getNewtalk())
 			and ($this->mTitle->getNamespace() != Namespace::getSpecial())
-			and ($action == 'view')
+			and ($action == 'view' || empty( $action ))
 			and (!isset($oldid))
 			and (!isset($diff))
 			and (!isset($redirect))