Skip to content

Commit

Permalink
(Fixes issue 549)
Browse files Browse the repository at this point in the history
  • Loading branch information
qiang.xue committed Aug 28, 2009
1 parent 67ad85a commit 4d1d188
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CHANGELOG
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions framework/utils/CDateTimeParser.php
Expand Up @@ -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)
Expand Down Expand Up @@ -106,13 +108,15 @@ 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;
$i+=strlen($hour);
break;
}
case 'hh':
case 'HH':
{
if(($hour=self::parseInteger($value,$i,2,2))===false)
return false;
Expand Down

0 comments on commit 4d1d188

Please sign in to comment.