Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1365 from creocoder/chtml-error-css-bug

Fixes #1364: Empty CHtml::$errorCss cause class attribute rendering errors
  • Loading branch information...
commit 604441c10333eb5be396bf067805eb80a66d8775 2 parents d865a3b + 6f4f532
@samdark samdark authored
Showing with 4 additions and 0 deletions.
  1. +1 −0  CHANGELOG
  2. +3 −0  framework/web/helpers/CHtml.php
View
1  CHANGELOG
@@ -15,6 +15,7 @@ Version 1.1.13 work in progress
- Bug #1181: Fixed can read but not save binary data e.g. BYTEA on PostgreSQL (karmakaze)
- Bug #1249: CHttpRequest::sendFile() outputs malformed file content in some specific circumstances (andyhu)
- Bug #1330: SQLite column default value was incorrect for column of type string and DEFAULT NULL (cebe)
+- Bug #1364: Empty CHtml::$errorCss cause class attribute rendering errors (creocoder)
- Enh #117: Added CPhpMessageSource::$extensionPaths to allow extensions, that do not have a base class to use as category prefix, to register message source (rcoelho, cebe)
- Enh #291: CFormatter::formatDate and formatDateTime now also accept strings in strtotime() format (francis_tm, cebe)
- Enh #486: CHttpSession::$gCProbability and CDbHttpSession::$gCProbability are floats now. Minimal possible $gCProbability value has been changed to the ≈0.00000005% (1/2147483647), was integer 1% before, default value left unchanged (1%) (resurtm)
View
3  framework/web/helpers/CHtml.php
@@ -2201,6 +2201,9 @@ public static function resolveValue($model,$attribute)
*/
protected static function addErrorCss(&$htmlOptions)
{
+ if(empty(self::$errorCss))
+ return;
+
if(isset($htmlOptions['class']))
$htmlOptions['class'].=' '.self::$errorCss;
else
Please sign in to comment.
Something went wrong with that request. Please try again.