From 8e060d159fe410c354f67d30fd866ac564b10d5e Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Tue, 19 Aug 2014 15:36:44 +0100 Subject: [PATCH] Fix: Make CSSContentParser's use of 'Tidy' consistent --- dev/CSSContentParser.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/CSSContentParser.php b/dev/CSSContentParser.php index af29ce0a0..185785919 100644 --- a/dev/CSSContentParser.php +++ b/dev/CSSContentParser.php @@ -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 {