From: Reedy <reedy@wikimedia.org>
Date: Fri, 18 May 2018 19:39:26 +0000 (+0000)
Subject: Remove else from UserGroupMembership
X-Git-Tag: 1.34.0-rc.0~5385^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=f22a83c3b0f2a8d568cdade08404ea9469661f1b

Remove else from UserGroupMembership

Change-Id: I7c18df1cab69df5f124c95b1ddb241e3f1be5927
---

diff --git a/includes/user/UserGroupMembership.php b/includes/user/UserGroupMembership.php
index 9da0370e20..89cdc5f194 100644
--- a/includes/user/UserGroupMembership.php
+++ b/includes/user/UserGroupMembership.php
@@ -230,9 +230,8 @@ class UserGroupMembership {
 	public function isExpired() {
 		if ( !$this->expiry ) {
 			return false;
-		} else {
-			return wfTimestampNow() > $this->expiry;
 		}
+		return wfTimestampNow() > $this->expiry;
 	}
 
 	/**
@@ -354,9 +353,8 @@ class UserGroupMembership {
 		$ugm = self::newFromRow( $row );
 		if ( !$ugm->isExpired() ) {
 			return $ugm;
-		} else {
-			return false;
 		}
+		return false;
 	}
 
 	/**
@@ -419,9 +417,8 @@ class UserGroupMembership {
 			}
 			return $context->msg( 'group-membership-link-with-expiry' )
 				->params( $groupLink, $expiryDT, $expiryD, $expiryT )->text();
-		} else {
-			return $groupLink;
 		}
+		return $groupLink;
 	}
 
 	/**