critical bugfix GA snippet

plus another case meta content-type

Signed-off-by: Bruno Meilick <b@bnomei.com>

Author: bnomei

kirby-htmlhead.php

@@ -62,7 +62,7 @@ function($page, $title = null) {
       '<meta charset="utf-8">',
       '<meta http-equiv="x-ua-compatible" content="ie=edge">',
       '<meta name="viewport" content="width=device-width, initial-scale=1">',
-      '<meta http-equiv="content-type" content="text/html; charset=utf-8" />',
+      // '<meta http-equiv="content-type" content="text/html; charset=utf-8" />',
       '<base href="'.site()->url().'">',
     ];
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "kirby-htmlhead",
   "description": "Kirby Page Method to add code into the HTML Head using snippets",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "type": "kirby-plugin",
   "license": "MIT",
   "author": "Bruno Meilick"

snippets/htmlhead-googleanalytics.php

@@ -1,11 +1,10 @@
-	<?php 
+	<?php
     $htmlhead_googleanalytics = c::get('plugin.htmlhead.googleanalytics', 'UA-');
     $htmlhead_googleanalytics_anonymizeIp = c::get('plugin.htmlhead.googleanalytics.anonymizeIp', true);
 
-    if(!KirbyHTMLHead::is_localhost() && strlen($gakey) > strlen("UA-") ): ?>
-    <!-- Google Analytics -->
+    if(!KirbyHTMLHead::is_localhost() && strlen($htmlhead_googleanalytics) > strlen("UA-") ): ?>
     <script type="text/javascript">
-    var gaProperty = '<?php echo $gakey ?>';
+    var gaProperty = '<?php echo $htmlhead_googleanalytics ?>';
     var disableStr = 'ga-disable-' + gaProperty;
     if (document.cookie.indexOf(disableStr + '=true') > -1) { window[disableStr] = true;
     }
@@ -18,10 +17,10 @@ function gaOptout() {
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
       m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
       })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-      ga('create', '<?php echo $gakey ?>', 'auto');
+      ga('create', '<?php echo $htmlhead_googleanalytics ?>', 'auto');
       <?php if($htmlhead_googleanalytics_anonymizeIp): ?>
       ga('set', 'anonymizeIp', true);
       <?php endif; ?>
       ga('send', 'pageview');
     </script>
-    <?php endif; ?>
+    <?php endif; ?>