Making debug() not html escape in cli contexts.

cakephp · Feb 26, 2011 · 72245eb · 72245eb
1 parent 19bcec5
commit 72245eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cake/basics.php b/cake/basics.php
@@ -98,7 +98,7 @@ function debug($var = false, $showHtml = null, $showFrom = true) {
 			if (php_sapi_name() == 'cli') {
 				$template = $text;
 			}
-			if ($showHtml === null) {
+			if ($showHtml === null && $template !== $text) {
 				$showHtml = true;
 			}
 			$var = print_r($var, true);

diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php
@@ -683,7 +683,7 @@ public function testDebug() {
 		$this->assertPattern($pattern, $result);
 
 		ob_start();
-			debug('<div>this-is-a-test</div>');
+			debug('<div>this-is-a-test</div>', true);
 		$result = ob_get_clean();
 		$pattern = '/(.+?tests(\/|\\\)cases(\/|\\\)basics\.test\.php|';
 		$pattern .= preg_quote(substr(__FILE__, 1), '/') . ')';
@@ -761,7 +761,7 @@ public function testStripslashesDeep() {
  * @return void
  */
 	public function testStripslashesDeepSybase() {
-		$this->skipUnless(ini_get('magic_quotes_sybase') === '1', '%s magic_quotes_sybase is off');
+		$this->skipUnless(ini_get('magic_quotes_sybase') === '1', 'magic_quotes_sybase is off');
 
 		$this->assertEqual(stripslashes_deep("tes\'t"), "tes\'t");