Prevent booleans from being encoded (converted to strings) by h() fun…

…ction, helps prevent accidental fatal errors in some PHP versions around 5.2.9
cakephp · Jul 20, 2012 · 1ea457e · 1ea457e
1 parent f65b52b
commit 1ea457e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/Cake/Test/Case/BasicsTest.php b/lib/Cake/Test/Case/BasicsTest.php
@@ -225,6 +225,15 @@ public function testH() {
 			'n' => '&nbsp;'
 		);
 		$this->assertEquals($expected, $result);
+
+		// Test that boolean values are not converted to strings
+		$result = h(false);
+		$this->assertFalse($result);
+
+		$arr = array('foo' => false, 'bar' => true);
+		$result = h($arr);
+		$this->assertFalse($result['foo']);
+		$this->assertTrue($result['bar']);
 
 		$obj = new stdClass();
 		$result = h($obj);

diff --git a/lib/Cake/basics.php b/lib/Cake/basics.php
@@ -175,6 +175,8 @@ function h($text, $double = true, $charset = null) {
 		} else {
 			$text = '(object)' . get_class($text);
 		}
+	} elseif (is_bool($text)) {
+		return $text;
 	}
 
 	static $defaultCharset = false;