From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sat, 12 Apr 2008 00:30:01 +0000 (+0000)
Subject: Don't log if we unprotect and unprotected page but try to set an expiry
X-Git-Tag: 1.31.0-rc.0~48428
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=dcc835ca0b4ae22d20045e6905de685ede4470e8;p=lhc%2Fweb%2Fwiklou.git

Don't log if we unprotect and unprotected page but try to set an expiry
---

diff --git a/includes/Article.php b/includes/Article.php
index 3f3cdffc0a..dbb668a2c7 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1778,8 +1778,8 @@ class Article {
 		$updated = Article::flattenRestrictions( $limit );
 
 		$changed = ( $current != $updated );
-		$changed = $changed || ($this->mTitle->areRestrictionsCascading() != $cascade);
-		$changed = $changed || ($this->mTitle->mRestrictionsExpiry != $expiry);
+		$changed = $changed || ($updated && $this->mTitle->areRestrictionsCascading() != $cascade);
+		$changed = $changed || ($updated && $this->mTitle->mRestrictionsExpiry != $expiry);
 		$protect = ( $updated != '' );
 
 		# If nothing's changed, do nothing