FIX: Convert newlines to <br /> tags in string fields (fixes #1942)

silverstripe · May 30, 2013 · 4a15845 · 4a15845
1 parent 1c7b4a0
commit 4a15845
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/model/fieldtypes/StringField.php b/model/fieldtypes/StringField.php
@@ -96,6 +96,13 @@ public function prepValueForDB($value) {
 			return parent::prepValueForDB($value);
 		}
 	}
+
+	/**
+	 * @return string
+	 */
+	public function forTemplate() {
+		return nl2br($this->XML());
+	}
 
 	/**
 	 * Limit this field's content by a number of characters.

diff --git a/tests/model/StringFieldTest.php b/tests/model/StringFieldTest.php
@@ -5,6 +5,16 @@
  */
 
 class StringFieldTest extends SapphireTest {
+
+	/**
+	 * @covers StringField->forTemplate()
+	 */
+	public function testForTemplate() {
+		$this->assertEquals(
+			"this is<br />\na test!",
+			DBField::create_field('StringFieldTest_MyStringField', "this is\na test!")->forTemplate()
+		);
+	}
 
 	/**
 	 * @covers StringField->LowerCase()