dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove else from UserGroupMembership
[lhc/web/wiklou.git]
/
includes
/
user
/
UserGroupMembership.php
diff --git
a/includes/user/UserGroupMembership.php
b/includes/user/UserGroupMembership.php
index
9da0370
..
89cdc5f
100644
(file)
--- a/
includes/user/UserGroupMembership.php
+++ b/
includes/user/UserGroupMembership.php
@@
-230,9
+230,8
@@
class UserGroupMembership {
public function isExpired() {
if ( !$this->expiry ) {
return false;
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;
$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();
}
return $context->msg( 'group-membership-link-with-expiry' )
->params( $groupLink, $expiryDT, $expiryD, $expiryT )->text();
- } else {
- return $groupLink;
}
}
+ return $groupLink;
}
/**
}
/**