tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUGFIX: Ensure diff arrays are one-dimensional

This commit is contained in:
Aaron Carlino 2020-03-17 15:57:28 +13:00
parent 687435a2f1
commit 7ad5f1bb14
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/View/Parsers/Diff.php
View File

@ -174,6 +174,7 @@ class Diff extends \Diff
$content = $content ? "true" : "false";
}
if (is_array($content)) {
$content = array_filter($content, 'is_scalar');
// Convert array to CSV
$content = implode(',', $content);
}

11
tests/php/View/Parsers/DiffTest.php
View File

@ -77,4 +77,15 @@ class DiffTest extends SapphireTest
$this->assertRegExp($expected, $actual);
}
public function testDiffArray()
{
$from = ['Lorem', ['array here please ignore'], 'ipsum dolor'];
$to = 'Lorem,ipsum';
$expected = "/^Lorem,ipsum *<del>dolor<\/del> *$/";
$actual = Diff::compareHTML($from, $to);
$this->assertRegExp($expected, $actual);
}
}