diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-11-19 01:03:12 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-11-19 01:03:12 +0100 |
| commit | d213e23ab6cdb0405fd68308ebb5758abd58e7f6 (patch) | |
| tree | b2158c2c749c0ff234a67232aae381f67f87f193 /phpBB/includes | |
| parent | c31787436e246b8c28d07dd55142f52188d7bb72 (diff) | |
| parent | 0d3396487e58091053778c9eb40ebcb6fa86536f (diff) | |
| download | forums-d213e23ab6cdb0405fd68308ebb5758abd58e7f6.tar forums-d213e23ab6cdb0405fd68308ebb5758abd58e7f6.tar.gz forums-d213e23ab6cdb0405fd68308ebb5758abd58e7f6.tar.bz2 forums-d213e23ab6cdb0405fd68308ebb5758abd58e7f6.tar.xz forums-d213e23ab6cdb0405fd68308ebb5758abd58e7f6.zip | |
Merge remote-tracking branch 'Marc/ticket/11896' into develop
* Marc/ticket/11896:
[ticket/11896] Use $form_time and fix out of bounds $form_time
[ticket/11896] Correctly document return of null in docblocks
[ticket/11896] Minor code improvements in phpbb_functional_test_case
[ticket/11896] Add functional tests for marking all notifications read
[ticket/11896] Add ability to define expected message after posting
[ŧicket/11896] Set form_time with time() when marking all notifications read
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_notifications.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php index 5a896c31b0..63dbe79666 100644 --- a/phpBB/includes/ucp/ucp_notifications.php +++ b/phpBB/includes/ucp/ucp_notifications.php @@ -27,7 +27,8 @@ class ucp_notifications add_form_key('ucp_notification'); $start = $request->variable('start', 0); - $form_time = min($request->variable('form_time', 0), time()); + $form_time = $request->variable('form_time', 0); + $form_time = ($form_time <= 0 || $form_time > time()) ? time() : $form_time; $phpbb_notifications = $phpbb_container->get('notification_manager'); |