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 #6413 from volkerloew/1400-text-contextsummary

Browse Source 
search term highlighting without altering case (fixes #1400)
This commit is contained in:
Daniel Hensby 2016-12-28 13:36:08 +00:00 committed by GitHub
commit c8a40605ec
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
model/fieldtypes/Text.php
View File

@ -265,8 +265,7 @@ class Text extends StringField {
foreach($stringPieces as $stringPiece) { foreach($stringPieces as $stringPiece) {
if(strlen($stringPiece) > 2) { if(strlen($stringPiece) > 2) {
$summary = str_ireplace($stringPiece, "<span class=\"highlight\">$stringPiece</span>", $summary = preg_replace('/' . preg_quote($stringPiece, '/') . '/i', '<span class="highlight">$0</span>', $summary);
$summary);
} }
} }
} }

3
tests/model/TextTest.php
View File

@ -194,9 +194,10 @@ class TextTest extends SapphireTest {
$textObj->setValue($testString2); $textObj->setValue($testString2);
// test that it preserves case
$this->assertEquals( $this->assertEquals(
'This is <span class="highlight">some</span> <span class="highlight">test</span> text.' 'This is <span class="highlight">some</span> <span class="highlight">test</span> text.'
. ' <span class="highlight">test</span> <span class="highlight">test</span> what if you have...', . ' <span class="highlight">Test</span> <span class="highlight">test</span> what if you have...',
$textObj->ContextSummary(50, $testKeywords2) $textObj->ContextSummary(50, $testKeywords2)
); );