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

MINOR Allowing array-based values in Diff->getHTMLChunks() by imploding on comma (AIR-39)

Browse Source
This commit is contained in:
Ingo Schommer 2011-08-29 09:34:07 +02:00
parent 40db114218
commit d6f4b24066
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/Diff.php
View File

@ -788,7 +788,16 @@ class Diff
// echo "<p>" . htmlentities($content) . "</p>"; // echo "<p>" . htmlentities($content) . "</p>";
return self::cleanHTML($content); return self::cleanHTML($content);
} }
/**
* @param string|array If passed as an array, values will be concatenated with a comma.
*/
static function getHTMLChunks($content) { static function getHTMLChunks($content) {
if($content && !is_string($content) && !is_array($content) && !is_numeric($content)) {
throw new InvalidArgumentException('$content parameter needs to be a string or array');
}
if(is_array($content)) $content = implode(',', $content);
$content = str_replace(array("&nbsp;","<", ">"),array(" "," <", "> "),$content); $content = str_replace(array("&nbsp;","<", ">"),array(" "," <", "> "),$content);
$candidateChunks = split("[\t\r\n ]+", $content); $candidateChunks = split("[\t\r\n ]+", $content);
while(list($i,$item) = each($candidateChunks)) { while(list($i,$item) = each($candidateChunks)) {