X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fuser%2FUserGroupMembership.php;h=89cdc5f1946990fef888f0dee5468953b7008513;hp=9da0370e20851b15034c4f765c8f5a2b25afb1ef;hb=f22a83c3b0f2a8d568cdade08404ea9469661f1b;hpb=621d00d59bf589d17cf3fa1d18fe55ad5aa91812

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;
 	}
 
 	/**