diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-14 11:46:34 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-14 11:46:34 +0100 |
| commit | 0fe8c8e21315e00dbc06a87290fb268a2dc999a9 (patch) | |
| tree | 4bc75acb95f49de7bf5df9ec3eb684bc39c93ad0 /system/helpers/date_helper.php | |
| parent | ca6404749a8dd3ee5dd68d64832374dce05fe6a3 (diff) | |
| parent | 62c0647d241d556590d470ea27ac9aa36f609bfa (diff) | |
Merge branch 'feature/unit-tests' into develop
Diffstat (limited to 'system/helpers/date_helper.php')
| -rw-r--r-- | system/helpers/date_helper.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php index 2a34cf93e..7e60cccf8 100644 --- a/system/helpers/date_helper.php +++ b/system/helpers/date_helper.php @@ -128,15 +128,16 @@ if ( ! function_exists('standard_date')) function standard_date($fmt = 'DATE_RFC822', $time = '') { $formats = array( - 'DATE_ATOM' => '%Y-%m-%dT%H:%i:%s%Q', + 'DATE_ATOM' => '%Y-%m-%dT%H:%i:%s%O', 'DATE_COOKIE' => '%l, %d-%M-%y %H:%i:%s UTC', - 'DATE_ISO8601' => '%Y-%m-%dT%H:%i:%s%Q', + 'DATE_ISO8601' => '%Y-%m-%dT%H:%i:%s%O', 'DATE_RFC822' => '%D, %d %M %y %H:%i:%s %O', 'DATE_RFC850' => '%l, %d-%M-%y %H:%i:%s UTC', 'DATE_RFC1036' => '%D, %d %M %y %H:%i:%s %O', 'DATE_RFC1123' => '%D, %d %M %Y %H:%i:%s %O', + 'DATE_RFC2822' => '%D, %d %M %Y %H:%i:%s %O', 'DATE_RSS' => '%D, %d %M %Y %H:%i:%s %O', - 'DATE_W3C' => '%Y-%m-%dT%H:%i:%s%Q' + 'DATE_W3C' => '%Y-%m-%dT%H:%i:%s%O' ); if ( ! isset($formats[$fmt])) |