From: Reedy <reedy@wikimedia.org>
Date: Sun, 15 Jun 2014 23:49:34 +0000 (+0100)
Subject: Collapse duplicate $existingExpiry == 'infinity' case into else
X-Git-Tag: 1.31.0-rc.0~15373^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=commitdiff_plain;h=0bad5a937498ff9be9613be02f86bec68e298a39;p=lhc%2Fweb%2Fwiklou.git

Collapse duplicate $existingExpiry == 'infinity' case into else

Change-Id: I1cc612e9f646dd75f58cc6ae0ae073ebffa7d6d3
---

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index d34ee034fb..456e4e6f9b 100644
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -117,15 +117,12 @@ class ProtectionForm {
 				// Expiry selected from list
 				$this->mExpiry[$action] = '';
 				$this->mExpirySelection[$action] = $requestExpirySelection;
-			} elseif ( $existingExpiry == 'infinity' ) {
-				// Existing expiry is infinite, use "infinite" in drop-down
-				$this->mExpiry[$action] = '';
-				$this->mExpirySelection[$action] = 'infinite';
 			} elseif ( $existingExpiry ) {
 				// Use existing expiry in its own list item
 				$this->mExpiry[$action] = '';
 				$this->mExpirySelection[$action] = $existingExpiry;
 			} else {
+				// Catches 'infinity' - Existing expiry is infinite, use "infinite" in drop-down
 				// Final default: infinite
 				$this->mExpiry[$action] = '';
 				$this->mExpirySelection[$action] = 'infinite';