From ffb37f8eaba3625fb567579bf85b76d039861937 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Thu, 24 Oct 2013 02:00:43 +0400 Subject: [PATCH] fixes #1001 --- framework/yii/grid/DataColumn.php | 8 ++++---- framework/yii/validators/UniqueValidator.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/framework/yii/grid/DataColumn.php b/framework/yii/grid/DataColumn.php index 9459aae4b6..e8a25a7cd1 100644 --- a/framework/yii/grid/DataColumn.php +++ b/framework/yii/grid/DataColumn.php @@ -41,10 +41,10 @@ class DataColumn extends Column */ public $value; /** - * @var string in which format should the value of each data model be displayed as (e.g. "text", "html"). - * Supported formats are determined by the [[GridView::formatter|formatter]] used by the [[GridView]]. - * Default format is "text" which will format the value as an HTML-encoded plain text when - * [[\yii\base\Formatter]] or [[\yii\i18n\Formatter]] is used. + * @var string|array in which format should the value of each data model be displayed as (e.g. "text", "html", + * ['date', 'Y-m-d']). Supported formats are determined by the [[GridView::formatter|formatter]] used by + * the [[GridView]]. Default format is "text" which will format the value as an HTML-encoded plain text when + * [[\yii\base\Formatter::format()]] or [[\yii\i18n\Formatter::format()]] is used. */ public $format = 'text'; /** diff --git a/framework/yii/validators/UniqueValidator.php b/framework/yii/validators/UniqueValidator.php index a698d968b2..334d057a90 100644 --- a/framework/yii/validators/UniqueValidator.php +++ b/framework/yii/validators/UniqueValidator.php @@ -12,7 +12,7 @@ use yii\base\InvalidConfigException; use yii\db\ActiveRecord; /** - * CUniqueValidator validates that the attribute value is unique in the corresponding database table. + * UniqueValidator validates that the attribute value is unique in the corresponding database table. * * @author Qiang Xue * @since 2.0