diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-11-13 19:34:27 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-11-13 19:34:27 +0100 |
| commit | 3284e376bed538aff3112cd2d6eef70bccb91446 (patch) | |
| tree | 74d9c959c09a386d154c2c031a8098d5decf84a5 /system | |
| parent | 928941a5d5397d8ee1302103f7b68b49a76b5a33 (diff) | |
| parent | b1cbd712c84649a00fee5293cfcb3cc8a05db2ec (diff) | |
Merge pull request #665 from syahzul/develop
Fixed invalid date time format in date_helper and xmlrpc library.
Diffstat (limited to 'system')
| -rw-r--r-- | system/helpers/date_helper.php | 2 | ||||
| -rw-r--r-- | system/libraries/Xmlrpc.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php index 447bf55ac..8c92fdc89 100644 --- a/system/helpers/date_helper.php +++ b/system/helpers/date_helper.php @@ -132,7 +132,7 @@ if ( ! function_exists('standard_date')) 'DATE_COOKIE' => '%l, %d-%M-%y %H:%i:%s UTC', 'DATE_ISO8601' => '%Y-%m-%dT%H:%i:%s%Q', 'DATE_RFC822' => '%D, %d %M %y %H:%i:%s %O', - 'DATE_RFC850' => '%l, %d-%M-%y %H:%m:%i UTC', + '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_RSS' => '%D, %d %M %Y %H:%i:%s %O', diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index 2f66ef09a..7b1e3fa6e 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -1416,14 +1416,14 @@ class XML_RPC_Values extends CI_Xmlrpc { if ($utc == 1) { - $t = strftime("%Y%m%dT%H:%M:%S", $time); + $t = strftime("%Y%m%dT%H:%i:%s", $time); } else { if (function_exists('gmstrftime')) - $t = gmstrftime("%Y%m%dT%H:%M:%S", $time); + $t = gmstrftime("%Y%m%dT%H:%i:%s", $time); else - $t = strftime("%Y%m%dT%H:%M:%S", $time - date('Z')); + $t = strftime("%Y%m%dT%H:%i:%s", $time - date('Z')); } return $t; } |