From 4d1d1881260b68ccba747c1d62d500e3e2085e76 Mon Sep 17 00:00:00 2001
From: "qiang.xue" <qiang.xue@c7f931c7-7552-0410-b027-2fb3d89d9100>
Date: Fri, 28 Aug 2009 18:51:17 +0000
Subject: [PATCH] (Fixes issue 549)

---
 CHANGELOG                           | 3 ++-
 framework/utils/CDateTimeParser.php | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3ec1bfa273..8a1fe870b9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,7 +24,8 @@ Version 1.0.9 to be released
 - Enh #511: CHtml::activeCheckBox and activeRadioButton should respect the value attribute (Qiang)
 - Enh #512: CHtml::beginForm() is made XHTML-compliant when CSRF is enabled (Qiang)
 - Enh #526: Added CSort::params and CPagination::params to allow customizing additional GET parameters in the generated URLs (Qiang)
-- Enh #547: Change CSort::resolveLabel and validateAttribute to be public (Qiang)
+- Enh #547: Changed CSort::resolveLabel and validateAttribute to be public (Qiang)
+- Enh #549: Changed hour pattern in CDateTimeParser so that it is consistent with CDateFormatter (Qiang)
 - Enh: Added CWebUser::setStateKeyPrefix() (Qiang)
 - Enh: Added CLocale::getMonthNames and CLocale::getWeekDayNames (Qiang)
 - Enh: Added uncheckValue option for CHtml::activeRadioButton (Qiang)
diff --git a/framework/utils/CDateTimeParser.php b/framework/utils/CDateTimeParser.php
index 6b146dab89..4b4d846076 100644
--- a/framework/utils/CDateTimeParser.php
+++ b/framework/utils/CDateTimeParser.php
@@ -25,6 +25,8 @@
  * yyyy    | 4 year digit, e.g., 2005
  * h       | Hour in 0 to 23, no padding (since version 1.0.5)
  * hh      | Hour in 00 to 23, zero leading (since version 1.0.5)
+ * H       | Hour in 0 to 23, no padding (since version 1.0.9)
+ * HH      | Hour in 00 to 23, zero leading (since version 1.0.9)
  * m       | Minutes in 0 to 59, no padding (since version 1.0.5)
  * mm      | Minutes in 00 to 59, zero leading (since version 1.0.5)
  * s	   | Seconds in 0 to 59, no padding (since version 1.0.5)
@@ -106,6 +108,7 @@ public static function parse($value,$pattern='MM/dd/yyyy')
 					break;
 				}
 				case 'h':
+				case 'H':
 				{
 					if(($hour=self::parseInteger($value,$i,1,2))===false)
 						return false;
@@ -113,6 +116,7 @@ public static function parse($value,$pattern='MM/dd/yyyy')
 					break;
 				}
 				case 'hh':
+				case 'HH':
 				{
 					if(($hour=self::parseInteger($value,$i,2,2))===false)
 						return false;