mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Fix: Make CSSContentParser's use of 'Tidy' consistent
This commit is contained in:
parent
8bd867ef4e
commit
8e060d159f
@ -30,7 +30,7 @@ class CSSContentParser extends Object {
|
||||
array(
|
||||
'output-xhtml' => true,
|
||||
'numeric-entities' => true,
|
||||
'wrap' => 99999, // We need this to be consistent for functional test string comparisons
|
||||
'wrap' => 0, // We need this to be consistent for functional test string comparisons
|
||||
),
|
||||
'utf8'
|
||||
);
|
||||
@ -41,7 +41,7 @@ class CSSContentParser extends Object {
|
||||
} elseif(@shell_exec('which tidy')) {
|
||||
// using tiny through cli
|
||||
$CLI_content = escapeshellarg($content);
|
||||
$tidy = `echo $CLI_content | tidy -n -q -utf8 -asxhtml 2> /dev/null`;
|
||||
$tidy = `echo $CLI_content | tidy -n -q -utf8 -asxhtml -w 0 2> /dev/null`;
|
||||
$tidy = str_replace('xmlns="http://www.w3.org/1999/xhtml"','',$tidy);
|
||||
$tidy = str_replace(' ','',$tidy);
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user