Fixed wrong encoded JSON inside script tags

README.md

@@ -120,6 +120,9 @@ $defer->empty_src               = '';
 $defer->use_color_placeholder   = true;
 $defer->use_css_fadein_effects  = true;
 
+// Manually add deferjs library script tag
+// $defer->manually_add_deferjs   = true;
+
 // Blacklist
 $defer->do_not_optimize = [
     'document\.write\s*\(',

src/Defer.php

@@ -140,7 +140,8 @@ public function toHtml()
             $output = $this->dom->saveHtml();
         }
 
-        $output = $this->script_decode($this->entity2charset($output, $this->charset));
+        $output = $this->script_decode($output);
+        $output = $this->entity2charset($output, $this->charset);
 
         if (!empty($this->bug72288_body)) {
             $output = preg_replace('/(<body[^>]*>)/mi', $this->bug72288_body, $output, 1);

src/DeferOptimizer.php

@@ -129,8 +129,8 @@ protected function addDeferJs()
             return;
         }
 
-        $extra_scripts  = [];
-        $the_anchor     = $this->head->childNodes->item(0);
+        $extra_scripts = [];
+        $the_anchor    = $this->head->childNodes->item(0);
 
         // Append the defer.js library and polyfill
         if (!$this->manually_add_deferjs) {
@@ -434,7 +434,7 @@ protected function minifyOutputHTML()
             }
 
             if ($trimmed != $node->nodeValue) {
-                $node->nodeValue = htmlspecialchars($trimmed);
+                $node->nodeValue = $trimmed;
             }
         }
     }

src/DeferParser.php

@@ -650,6 +650,7 @@ protected function script_encode($html)
             }
 
             $next = '@@@SCRIPT@@@' . count($this->bug_script_templates) . '@@@SCRIPT@@@';
+
             $this->bug_script_templates[$next] = trim($matches[2]);
 
             return "{$matches[1]}{$next}{$matches[3]}";

test/test.php

@@ -54,9 +54,10 @@
 $defer->use_css_fadein_effects = true;
 $defer->use_color_placeholder  = false;
 
-$defer->manually_add_deferjs   = true;
+// Manually add deferjs library script tag
+// $defer->manually_add_deferjs   = true;
 
-// $defer->clearCache();
+$defer->clearCache();
 
 // Scan test files
 $list = glob(INPUT . '*.html');