Skip to content

Commit

Permalink
Fixed yiisoft#1499 CVarDumper error in highlighting "\"
Browse files Browse the repository at this point in the history
  • Loading branch information
anton committed Sep 30, 2012
1 parent e2fa220 commit e566608
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Expand Up @@ -24,6 +24,7 @@ Version 1.1.13 work in progress
- Bug #1364: Empty CHtml::$errorCss cause class attribute rendering errors (creocoder)
- Bug #1444: Fixed CGoogleApi::register call to registerScriptFile (mdomba)
- Bug #1465: Fixed CHtml::beginForm() when CActiveForm with method GET and ajaxButton is used (mdomba)
- Bug #1499: Fixed CVarDumper highlighting "\" (antoncpu)
- Bug #1485 CSort does not quote table alias when using CDbCriteria (undsoft)
- Enh #104: Added CWebLogRoute::$collapsedInFireBug property to control whether the log should be collapsed by default in Firebug (marcovtwout)
- Enh #84: Log route categories are now accepted in form of array. Added CLogRoute::except and parameter to CLogRoute::getLogs that allows you to exclude specific categories (paystey)
Expand Down
11 changes: 4 additions & 7 deletions framework/utils/CVarDumper.php
Expand Up @@ -106,13 +106,10 @@ private static function dumpInternal($var,$level)
self::$_output.="array\n".$spaces.'(';
foreach($keys as $key)
{
if(gettype($key)=='integer')
$key2=$key;
else
$key2="'".str_replace("'","\\'",$key)."'";

self::$_output.="\n".$spaces." $key2 => ";
self::$_output.=self::dumpInternal($var[$key],$level+1);
self::$_output.="\n".$spaces.' ';
self::dumpInternal($key,0);
self::$_output.=' => ';
self::dumpInternal($var[$key],$level+1);
}
self::$_output.="\n".$spaces.')';
}
Expand Down

0 comments on commit e566608

Please sign in to comment.