Stop goofy formatting when newlines are present already.

lib/Cake/Test/Case/Utility/StringTest.php

@@ -377,6 +377,23 @@ public function testWordWrapUnicodeAware() {
 		$this->assertTextEquals($expected, $result, 'Text not wrapped.');
 	}
 
+/**
+ * test that wordWrap() properly handle newline characters.
+ *
+ * @return void
+ */
+	public function testWordWrapNewlineAware() {
+		$text = 'This is a line that is almost the 55 chars long.
+This is a new sentence which is manually newlined, but is so long it needs two lines.';
+		$result = String::wordWrap($text, 55);
+		$expected = <<<TEXT
+This is a line that is almost the 55 chars long.
+This is a new sentence which is manually newlined, but
+is so long it needs two lines.
+TEXT;
+		$this->assertTextEquals($expected, $result, 'Text not wrapped.');
+	}
+
 /**
  * test wrap method.
  *

lib/Cake/Utility/String.php

@@ -346,7 +346,7 @@ public static function wrap($text, $options = array()) {
 	}
 
 /**
- * Unicode aware version of wordwrap.
+ * Unicode and newline aware version of wordwrap.
  *
  * @param string $text The text to format.
  * @param int $width The width to wrap to. Defaults to 72.
@@ -355,6 +355,23 @@ public static function wrap($text, $options = array()) {
  * @return string Formatted text.
  */
 	public static function wordWrap($text, $width = 72, $break = "\n", $cut = false) {
+		$paragraphs = explode($break, $text);
+		foreach ($paragraphs as &$paragraph) {
+			$paragraph = String::_wordWrap($paragraph, $width, $break, $cut);
+		}
+		return implode($break, $paragraphs);
+	}
+
+/**
+ * Unicode aware version of wordwrap as helper method.
+ *
+ * @param string $text The text to format.
+ * @param int $width The width to wrap to. Defaults to 72.
+ * @param string $break The line is broken using the optional break parameter. Defaults to '\n'.
+ * @param bool $cut If the cut is set to true, the string is always wrapped at the specified width.
+ * @return string Formatted text.
+ */
+	protected static function _wordWrap($text, $width = 72, $break = "\n", $cut = false) {
 		if ($cut) {
 			$parts = array();
 			while (mb_strlen($text) > 0) {