diff options
| author | diosmosis <benakamoorthi@fastmail.fm> | 2013-12-20 08:33:57 +0400 |
|---|---|---|
| committer | diosmosis <benakamoorthi@fastmail.fm> | 2013-12-20 08:34:11 +0400 |
| commit | 2f3bb08029763a118552fe8f6ac80253efb24eaf (patch) | |
| tree | 605565460a91504708610ca0787ea22cdb7ee616 /core/Date.php | |
| parent | 853b18cd1a5722650f18189e26afbea13bb20d92 (diff) | |
Fixes #4380, make sure site's timezone is applied when selecting log data to aggregate. Includes integration test + doc fixes to Date function.
Diffstat (limited to 'core/Date.php')
| -rw-r--r-- | core/Date.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/Date.php b/core/Date.php index a618b8749a..3b21ed186a 100644 --- a/core/Date.php +++ b/core/Date.php @@ -79,8 +79,8 @@ class Date * * @param string|int $dateString `'today'`, `'yesterday'`, `'now'`, `'yesterdaySameTime'`, a string with * `'YYYY-MM-DD HH:MM:SS'` format or a unix timestamp. - * @param string $timezone The timezone of `$dateString`. If specified, `$dateString` will be converted - * from this timezone to UTC before being used in the Date return value. + * @param string $timezone The timezone of the result. If specified, `$dateString` will be converted + * from UTC to this timezone before being used in the Date return value. * @throws Exception If `$dateString` is in an invalid format or if the time is before * Tue, 06 Aug 1991. * @return Date @@ -204,10 +204,10 @@ class Date } /** - * Converts a timestamp in a timezone to UTC. + * Converts a timestamp in a from UTC to a timezone. * * @param int $timestamp The UNIX timestamp to adjust. - * @param string $timezone The timezone to adjust from. + * @param string $timezone The timezone to adjust to. * @return int The adjusted time as seconds from EPOCH. */ public static function adjustForTimezone($timestamp, $timezone) |