Time Period set to Last Xyz throws MySQL error

http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=34006&start=0

$nowDate will be quoted in function $query->dateAdd(...).
Don't set the (wrong) Item id.
Add an Itemid field only if we really need it (when Itemid is not implicit in the routed URL or included in the query string).
Fixes #3482
Fix reset password redirect
Update cms.php
Added empty line.
Code style
Merge pull request #4017 from illovo/patch-4

[#34006] Time Period set to Last Xyz throws MySQL error
 [#33638] Redirect to homepage when pressing the language flag after
page load (fix #4018)
Merge remote-tracking branch 'origin/staging' into staging
cs
Update en-GB.com_users.ini

The constant COM_USERS_RESET is used in components\com_users\views\reset\view.html.php
Merge pull request #4028 from SergeyLitvinov/patch-2

Missed COM_USERS_RESET in en-GB.com_users.ini