Skip to content
Browse files

Merge pull request #1978 branch '1977-CFormatter-normalizeDateValue-p…

…rotected' of https://github.com/etienneq/yii into etienneq-1977-CFormatter-normalizeDateValue-protected

* '1977-CFormatter-normalizeDateValue-protected' of https://github.com/etienneq/yii:
  minor change in changelog entry
  changelog
  #1977: declared CFormatter::normalizeDateValue() as protected

Conflicts:
	CHANGELOG
  • Loading branch information...
2 parents 26f11af + 5af9c75 commit f4c846470396fa5924fb6b0ef88fc8908cbb30f4 @cebe cebe committed Jan 30, 2013
Showing with 7 additions and 1 deletion.
  1. +1 −0 CHANGELOG
  2. +6 −1 framework/utils/CFormatter.php
View
1 CHANGELOG
@@ -17,6 +17,7 @@ Version 1.1.14 work in progress
- Bug #2049: CStatElement relation with join option throw exception when key-field present on joined table (Yiivgeny)
- Enh: Better CFileLogRoute performance (Qiang, samdark)
- Enh #1847: Added COutputCache::varyByLanguage to generate separate cache for different languages (Obramko)
+- Enh #1977: CFormatter::normalizeDateValue() now is protected instead of private to enable child classes to override it (etienneq)
- Enh #2038: CFormatter::formatNtext() method can replace newlines with `<p></p>` not just with `<br />` as it was before (resurtm)
- Chg #645: CDbConnection now throws CDbException when failed to open DB connection instead of failing with a warning (kidol, eirikhm, samdark, cebe)
- Chg #1891: Changed order of methods in models generated by Gii and yiic, added better description of search method (hijarian, samdark)
View
7 framework/utils/CFormatter.php
@@ -216,7 +216,12 @@ public function formatDatetime($value)
return date($this->datetimeFormat,$this->normalizeDateValue($value));
}
- private function normalizeDateValue($time)
+ /**
+ * Normalizes an expression as a timestamp.
+ * @param mixed $time the time expression to be normalized
+ * @return int the normalized result
+ */
+ protected function normalizeDateValue($time)
{
if(is_string($time))
{

0 comments on commit f4c8464

Please sign in to comment.
Something went wrong with that request. Please try again.