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 #9138 from caffeineinc/bugfix/9114-context-summary-breaks-with-line-breaks

Browse Source 
#9114 - DBText::ContextSummary() cuts line breaks
This commit is contained in:
Robbie Averill 2019-07-19 10:28:59 +02:00 committed by GitHub
commit 92881eacb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ORM/FieldType/DBText.php
View File

@ -194,7 +194,7 @@ class DBText extends DBString
}
// Get raw text value, but XML encode it (as we'll be merging with HTML tags soon)
$text = nl2br(Convert::raw2xml($this->Plain()));
$text = Convert::raw2xml($this->Plain());
$keywords = Convert::raw2xml($keywords);
// Find the search string
@ -239,7 +239,7 @@ class DBText extends DBString
$summary = $summary . $suffix;
}
return $summary;
return nl2br($summary);
}
public function scaffoldFormField($title = null, $params = null)

16
tests/php/ORM/DBHTMLTextTest.php
View File

@ -333,6 +333,22 @@ class DBHTMLTextTest extends SapphireTest
'ate',
// it should highlight 3 letters or more.
'A dog <mark>ate</mark> a cat while looking at a Foobar',
],
[
'<p>This is a lot of text before this but really, this is a test sentence</p>
<p>with about more stuff after the line break</p>',
35,
'test',
'... really, this is a <mark>test</mark> sentence...'
],
[
'<p>This is a lot of text before this but really, this is a test sentence</p>
<p>with about more stuff after the line break</p>',
50,
'with',
'... sentence<br />
<br />
<mark>with</mark> about more stuff...'
]
];
}