mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 14:18:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Lucas Bartholemy 2022-07-27 11:59:52 +02:00
commit 6d34699e78
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@ HumHub Changelog
--------------------- ---------------------
- Fix #5806: Alignments for People filters with Select2 mode - Fix #5806: Alignments for People filters with Select2 mode
- Fix #5813: Fix deprecated null value for hour param in `mktime()`
1.11.4 (July 6, 2022) 1.11.4 (July 6, 2022)

2
composer.json
View File

@ -66,7 +66,7 @@
"symfony/postmark-mailer": "^5.4", "symfony/postmark-mailer": "^5.4",
"symfony/sendgrid-mailer": "^5.4", "symfony/sendgrid-mailer": "^5.4",
"symfony/sendinblue-mailer": "^5.4", "symfony/sendinblue-mailer": "^5.4",
"twig/twig": "^1.0", "twig/twig": "^3.4.1",
"web-token/jwt-checker": ">=1.0 <3.0", "web-token/jwt-checker": ">=1.0 <3.0",
"web-token/jwt-signature": ">=1.0 <3.0", "web-token/jwt-signature": ">=1.0 <3.0",
"web-token/jwt-signature-algorithm-ecdsa": ">=1.0 <3.0", "web-token/jwt-signature-algorithm-ecdsa": ">=1.0 <3.0",

2
protected/humhub/modules/notification/Events.php
View File

@ -164,7 +164,7 @@ class Events extends \yii\base\BaseObject
{ {
return Notification::deleteAll(['AND', return Notification::deleteAll(['AND',
['seen' => (int)$seen], ['seen' => (int)$seen],
['<', 'created_at', date('Y-m-d', mktime(null, null, null, date('m') - $months))], ['<', 'created_at', date('Y-m-d', mktime(0, 0, 0, date('m') - $months))],
]); ]);
} }