diff --git a/lib/Cake/Utility/String.php b/lib/Cake/Utility/String.php index 4e277e54836..4731337f5d2 100644 --- a/lib/Cake/Utility/String.php +++ b/lib/Cake/Utility/String.php @@ -405,8 +405,8 @@ public static function wordWrap($text, $width = 72, $break = "\n", $cut = false) * - `html` If true, will ignore any HTML tags, ensuring that only the correct text is highlighted * - `regex` a custom regex rule that is used to match words, default is '|$tag|iu' * - * @param string $text Text to search the phrase in - * @param string $phrase The phrase that will be searched + * @param string $text Text to search the phrase in. + * @param string|array $phrase The phrase or phrases that will be searched. * @param array $options An array of html attributes and options. * @return string The highlighted text * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::highlight @@ -450,7 +450,7 @@ public static function highlight($text, $phrase, $options = array()) { } /** - * Strips given text of all links (