MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'hotfix-2.3.157'

pull/727/head
iglocska 2015-11-12 09:47:34 +01:00
parent 3a540542ed 69031ab35e
commit b097435879
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":3, "hotfix":156}
{"major":2, "minor":3, "hotfix":157}

3
app/Model/User.php
View File

@ -393,7 +393,8 @@ class User extends AppModel {
$sortedKeys = array('valid' => 0, 'expired' => 0, 'noEncrypt' => 0);
foreach ($subKeys as $subKey) {
$issue = false;
if ($currentTimestamp > $subKey->getExpirationDate()) {
$expiration = $subKey->getExpirationDate();
if ($expiration != 0 && $currentTimestamp > $expiration) {
$sortedKeys['expired']++;
continue;
}