From 708d462bf980f85c31d9e6584ad8f22ce3fae41f Mon Sep 17 00:00:00 2001 From: Bryan Crowe Date: Mon, 16 Dec 2013 21:14:32 -0500 Subject: [PATCH 1/4] Add Configure timezone to boostrap --- app/Config/core.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/Config/core.php b/app/Config/core.php index d686b39c0..e37fbb790 100644 --- a/app/Config/core.php +++ b/app/Config/core.php @@ -269,6 +269,14 @@ */ //date_default_timezone_set('UTC'); +/** + * ‘Config.timezone’ is available which you can set to user’s timezone string. + * If a method of CakeTime class is called with $timezone parameter as null and ‘Config.timezone’ is set, + * then the value of ‘Config.timezone’ will be used. This feature allows you to set user’s timezone just + * once instead of passing it each time in function calls. + */ + //Configure::write('Config.timezone', 'Europe/Paris') + /** * * Cache Engine Configuration From 4b2825431901b3bdd7409df8f956f26fba998800 Mon Sep 17 00:00:00 2001 From: Bryan Crowe Date: Mon, 16 Dec 2013 21:40:46 -0500 Subject: [PATCH 2/4] Fix whitespace error in Validation utility --- lib/Cake/Utility/Validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Cake/Utility/Validation.php b/lib/Cake/Utility/Validation.php index fa5f0e53a..e78a956cf 100644 --- a/lib/Cake/Utility/Validation.php +++ b/lib/Cake/Utility/Validation.php @@ -331,7 +331,7 @@ class Validation { $separator . '((1[6-9]|[2-9]\\d)\\d{2})$%'; $regex['my'] = '%^(' . $month . $separator . $year . ')$%'; - $regex['ym'] = '%^(' . $year . $separator . $month . ')$%'; + $regex['ym'] = '%^(' . $year . $separator . $month . ')$%'; $regex['y'] = '%^(' . $fourDigitYear . ')$%'; $format = (is_array($format)) ? array_values($format) : array($format); From 3a7650ad9be9b3e153981f811c6900e276ad7188 Mon Sep 17 00:00:00 2001 From: Bryan Crowe Date: Mon, 16 Dec 2013 21:51:36 -0500 Subject: [PATCH 3/4] Remove smart quotes from Configure timezone in bootstrap --- app/Config/core.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Config/core.php b/app/Config/core.php index e37fbb790..44060c128 100644 --- a/app/Config/core.php +++ b/app/Config/core.php @@ -270,9 +270,9 @@ //date_default_timezone_set('UTC'); /** - * ‘Config.timezone’ is available which you can set to user’s timezone string. - * If a method of CakeTime class is called with $timezone parameter as null and ‘Config.timezone’ is set, - * then the value of ‘Config.timezone’ will be used. This feature allows you to set user’s timezone just + * `Config.timezone` is available which you can set to user's timezone string. + * If a method of CakeTime class is called with $timezone parameter as null and `Config.timezone` is set, + * then the value of `Config.timezone` will be used. This feature allows you to set user's timezone just * once instead of passing it each time in function calls. */ //Configure::write('Config.timezone', 'Europe/Paris') From 20faace7757b9cd75e491a8a62c2cddea78d8ac3 Mon Sep 17 00:00:00 2001 From: Bryan Crowe Date: Mon, 16 Dec 2013 21:59:29 -0500 Subject: [PATCH 4/4] Clean up grammar in Configure timezone in bootstrap --- app/Config/core.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Config/core.php b/app/Config/core.php index 44060c128..17758d18a 100644 --- a/app/Config/core.php +++ b/app/Config/core.php @@ -270,9 +270,9 @@ //date_default_timezone_set('UTC'); /** - * `Config.timezone` is available which you can set to user's timezone string. + * `Config.timezone` is available in which you can set users' timezone string. * If a method of CakeTime class is called with $timezone parameter as null and `Config.timezone` is set, - * then the value of `Config.timezone` will be used. This feature allows you to set user's timezone just + * then the value of `Config.timezone` will be used. This feature allows you to set users' timezone just * once instead of passing it each time in function calls. */ //Configure::write('Config.timezone', 'Europe/Paris')