Added double_encode paramater to h()

cake/basics.php

@@ -143,11 +143,12 @@ function sortByKey(&$array, $sortby, $order = 'asc', $type = SORT_NUMERIC) {
  * Convenience method for htmlspecialchars.
  *
  * @param string $text Text to wrap through htmlspecialchars
+ * @param boolean $double Encode existing html entities
  * @param string $charset Character set to use when escaping.  Defaults to config value in 'App.encoding' or 'UTF-8'
  * @return string Wrapped text
  * @link http://book.cakephp.org/view/1132/h
  */
-	function h($text, $charset = null) {
+	function h($text, $double = true, $charset = null) {
 		if (is_array($text)) {
 			return array_map('h', $text);
 		}
@@ -160,9 +161,9 @@ function h($text, $charset = null) {
 			}
 		}
 		if ($charset) {
-			return htmlspecialchars($text, ENT_QUOTES, $charset);
+			return htmlspecialchars($text, ENT_QUOTES, $charset, $double);
 		} else {
-			return htmlspecialchars($text, ENT_QUOTES, $defaultCharset);
+			return htmlspecialchars($text, ENT_QUOTES, $defaultCharset, $double);
 		}
 	}
 

cake/tests/cases/basics.test.php

@@ -200,6 +200,14 @@ public function testH() {
 		$result = h($in);
 		$expected = array('this & that', '<p>Which one</p>');
 		$this->assertEqual($expected, $result);
+
+		$string = '<foo> & &nbsp;';
+		$result = h($string);
+		$this->assertEqual('&lt;foo&gt; &amp; &amp;nbsp;', $result);
+
+		$string = '<foo> & &nbsp;';
+		$result = h($string, false);
+		$this->assertEqual('&lt;foo&gt; &amp; &nbsp;', $result);
 	}
 
 /**