From: Rotem Liss <rotem@users.mediawiki.org>
Date: Thu, 3 Jul 2008 12:25:52 +0000 (+0000)
Subject: Replacing the fix for bug 12716.
X-Git-Tag: 1.31.0-rc.0~46781
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=35ad939f359d87fb7c11b2510aa5665492ba0297;p=lhc%2Fweb%2Fwiklou.git

Replacing the fix for bug 12716.
---

diff --git a/includes/Title.php b/includes/Title.php
index 3698791deb..ed6810c9a0 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1358,11 +1358,6 @@ class Title {
 			$dbw->delete( 'protected_titles', array( 'pt_namespace' => $namespace,
 				'pt_title' => $title ), __METHOD__ );
 		}
-		if($dbw->affectedRows() == 0) {
-			//No Change
-			return true;
-		}
-
 		# Update the protection log
 		$log = new LogPage( 'protect' );
 
@@ -1818,6 +1813,8 @@ class Title {
 					} else { // Get rid of the old restrictions
 						Title::purgeExpiredRestrictions();
 					}
+				} else {
+					$this->mRestrictionsExpiry = Block::decodeExpiry('');
 				}
 				$this->mRestrictionsLoaded = true;
 			}