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

Fix: Make CSSContentParser's use of 'Tidy' consistent

Browse Source
This commit is contained in:
Loz Calver 2014-08-19 15:36:44 +01:00
parent 8bd867ef4e
commit 8e060d159f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/CSSContentParser.php
View File

@ -30,7 +30,7 @@ class CSSContentParser extends Object {
array( array(
'output-xhtml' => true, 'output-xhtml' => true,
'numeric-entities' => 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' 'utf8'
); );
@ -41,7 +41,7 @@ class CSSContentParser extends Object {
} elseif(@shell_exec('which tidy')) { } elseif(@shell_exec('which tidy')) {
// using tiny through cli // using tiny through cli
$CLI_content = escapeshellarg($content); $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('xmlns="http://www.w3.org/1999/xhtml"','',$tidy);
$tidy = str_replace(' ','',$tidy); $tidy = str_replace(' ','',$tidy);
} else { } else {