tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2034 from kinglozzer/1942-stringfield-newlines

Browse Source 
FIX: Convert newlines to <br /> tags in string fields (fixes #1942)
This commit is contained in:
Simon Welsh 2013-05-30 01:45:17 -07:00
commit 87694b7f72
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
model/fieldtypes/StringField.php
View File

@ -96,6 +96,13 @@ abstract class StringField extends DBField {
return parent::prepValueForDB($value);
}
}
/**
* @return string
*/
public function forTemplate() {
return nl2br($this->XML());
}
/**
* Limit this field's content by a number of characters.

10
tests/model/StringFieldTest.php
View File

@ -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()