Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix CVarDumper highlighting "\" #1499

Closed
wants to merge 2 commits into from

2 participants

@slavcodev

CVarDumper highlight error if index of array is "\"

$var = array('\\' => 'value');
CVarDumper::dump($var, 1, true);
@samdark samdark was assigned
@antonCPU antonCPU referenced this pull request from a commit in antonCPU/yii
anton Fixed #1499 CVarDumper error in highlighting "\" e566608
@antonCPU antonCPU referenced this pull request from a commit in antonCPU/yii
anton Changed Bug #1499 position 880c30c
@samdark samdark closed this in af38da1
@samdark
Owner

Merged #1501.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 29, 2012
  1. @slavcodev
  2. @slavcodev

    CHANGELOG

    slavcodev authored
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 1 deletion.
  1. +1 −0  CHANGELOG
  2. +1 −1  framework/utils/CVarDumper.php
View
1  CHANGELOG
@@ -25,6 +25,7 @@ Version 1.1.13 work in progress
- 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 #1485 CSort does not quote table alias when using CDbCriteria (undsoft)
+- Bug #1499 Fix CVarDumper highlighting "\" (slavcodev)
- 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)
- 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)
View
2  framework/utils/CVarDumper.php
@@ -59,7 +59,7 @@ public static function dumpAsString($var,$depth=10,$highlight=false)
self::dumpInternal($var,0);
if($highlight)
{
- $result=highlight_string("<?php\n".self::$_output,true);
+ $result=str_replace('\\\\','\\',highlight_string("<?php\n".str_replace('\\','\\\\',self::$_output),true));
self::$_output=preg_replace('/&lt;\\?php<br \\/>/','',$result,1);
}
return self::$_output;
Something went wrong with that request. Please try again.