Merge pull request #5 from zanderwar/patch-1

hailwood · web-flow · commit 5189132a50c6 · 2018-02-13T10:36:17.000+13:00
Update SS_RelativeAssetsResponse.php
diff --git a/code/SS_RelativeAssetsResponse.php b/code/SS_RelativeAssetsResponse.php
@@ -7,7 +7,6 @@
  */
 class SS_RelativeAssetsResponseExtension extends Extension
 {
-
     function onBeforeInit()
     {
         if (is_a($this->owner, 'Controller')) {
@@ -21,16 +20,12 @@ class SS_RelativeAssetsResponse extends SS_HTTPResponse
 {
     public function setBody($body)
     {
-        $body = $body ? (string)$body : $body;
+        $body = (string)$body;
 
         $body = str_replace('"/assets/', '"assets/', $body);
         $body = str_replace('"assets/', '"/assets/', $body);
-        
-        json_decode($body);
-        $bodyIsJson = json_last_error() === JSON_ERROR_NONE;
-
 
-        if (!$bodyIsJson && class_exists('zz\Html\HTMLMinify')) {
+        if (!json_decode($body) && class_exists('zz\Html\HTMLMinify')) {
             $this->body = zz\Html\HTMLMinify::minify($body, [
                 'doctype' => zz\Html\HTMLMinify::DOCTYPE_HTML5,
                 'optimizationLevel' => zz\Html\HTMLMinify::OPTIMIZATION_ADVANCED

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`*/`
`8`	`8`	`class SS_RelativeAssetsResponseExtension extends Extension`
`9`	`9`	`{`
`10`		`-`
`11`	`10`	`function onBeforeInit()`
`12`	`11`	`{`
`13`	`12`	`if (is_a($this->owner, 'Controller')) {`
`@@ -21,16 +20,12 @@ class SS_RelativeAssetsResponse extends SS_HTTPResponse`
`21`	`20`	`{`
`22`	`21`	`public function setBody($body)`
`23`	`22`	`{`
`24`		`- $body = $body ? (string)$body : $body;`
	`23`	`+ $body = (string)$body;`
`25`	`24`
`26`	`25`	`$body = str_replace('"/assets/', '"assets/', $body);`
`27`	`26`	`$body = str_replace('"assets/', '"/assets/', $body);`
`28`		`-`
`29`		`- json_decode($body);`
`30`		`- $bodyIsJson = json_last_error() === JSON_ERROR_NONE;`
`31`		`-`
`32`	`27`
`33`		`- if (!$bodyIsJson && class_exists('zz\Html\HTMLMinify')) {`
	`28`	`+ if (!json_decode($body) && class_exists('zz\Html\HTMLMinify')) {`
`34`	`29`	`$this->body = zz\Html\HTMLMinify::minify($body, [`
`35`	`30`	`'doctype' => zz\Html\HTMLMinify::DOCTYPE_HTML5,`
`36`	`31`	`'optimizationLevel' => zz\Html\HTMLMinify::OPTIMIZATION_ADVANCED`