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 #6901 from mikenz/patch-12

Browse Source 
BUGFIX: Prevent infinite loop
This commit is contained in:
Daniel Hensby 2017-05-11 12:00:28 +01:00 committed by GitHub
commit fac2bab785
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,6 +187,9 @@ class Diff extends \Diff
$newChunk = $item;
while ($item[strlen($item)-1] != ">") {
$chunk = each($candidateChunks);
if ($chunk === false) {
break;
}
$item = $chunk['value'];
$newChunk .= ' ' . $item;
}