summaryrefslogtreecommitdiffstats
path: root/system/helpers
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-03-14 11:46:34 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-03-14 11:46:34 +0100
commit0fe8c8e21315e00dbc06a87290fb268a2dc999a9 (patch)
tree4bc75acb95f49de7bf5df9ec3eb684bc39c93ad0 /system/helpers
parentca6404749a8dd3ee5dd68d64832374dce05fe6a3 (diff)
parent62c0647d241d556590d470ea27ac9aa36f609bfa (diff)
Merge branch 'feature/unit-tests' into develop
Diffstat (limited to 'system/helpers')
-rw-r--r--system/helpers/date_helper.php7
-rw-r--r--system/helpers/inflector_helper.php2
2 files changed, 5 insertions, 4 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]))
diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 2f6b40aa7..ad9cd1fbd 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -173,7 +173,7 @@ if ( ! function_exists('camelize'))
{
function camelize($str)
{
- return substr(str_replace(' ', '', ucwords(preg_replace('/[\s_]+/', ' ', $str))), 1);
+ return strtolower($str[0]).substr(str_replace(' ', '', ucwords(preg_replace('/[\s_]+/', ' ', $str))), 1);
}
}