Changeset 2651849

Timestamp:

01/02/2022 02:42:01 PM (4 years ago)

Author:

jrozanski

Message:

Fix for header generation

Location:

wide-angle-analytics/trunk

Files:

• readme.txt (modified) (1 diff)
• wide-angle-analytics.php (modified) (5 diffs)

wide-angle-analytics/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 5.8.2
 Requires PHP: 7.2
-Stable tag: 1.0.3
+Stable tag: 1.0.4
 License: GPLv2
 

wide-angle-analytics/trunk/wide-angle-analytics.php

@@ -6 +6 @@
   Author:               Wide Angle Analytics by Input Objects GmbH
   Author URI:           https://wideangle.co
-  Version:              1.0.3
+  Version:              1.0.4
   Requires at least:    5.2
   Requires PHP:         7.2
@@ -40 +40 @@
     add_action('admin_init', array( &$this, 'registerPluginSettings' ) );
     add_action('admin_menu', array( &$this, 'registerAdminMenu' ));
+
+    $this->plugin->generator = new WideAngleGenerator(get_option(self::WAA_CONF_ATTRIBUTES));
     add_action('wp_head', array( &$this, 'renderHeaderScript'));
     add_action('wp_footer', array( &$this, 'renderFooterScript'));
@@ -49 +51 @@
    */
   function renderHeaderScript() {
-    $generator = new WideAngleGenerator(get_option(self::WAA_CONF_ATTRIBUTES));
-    $this->renderContent($generator->generateHeaderScript()); // The Escaping takes place in the WideAngleGenerator::generateHeaderScript method.
+    $this->renderContent($this->plugin->generator->generateHeaderScript()); // The Escaping takes place in the WideAngleGenerator::generateHeaderScript method.
   }
 
@@ -58 +59 @@
    */
   function renderFooterScript() {
-    $generator = new WideAngleGenerator(get_option(self::WAA_CONF_ATTRIBUTES));
-    $this->renderContent($generator->generateHeaderScript()); // The Escaping takes place in the WideAngleGenerator::generateHeaderScript method.
+    $this->renderContent($this->plugin->generator->generateFooterScript()); // The Escaping takes place in the WideAngleGenerator::generateFooterScript method.
   }
 
@@ -130 +130 @@
         if(count($errors) === 0) {
           $attributes = new WideAngleAttributes($waaSiteId->get_value(), $waaTrackerDomain->get_value(), $waaIgnoreHash->get_value(), $waaExclusionPaths->get_value(), $waaIncParams->get_value());
-
           update_option(self::WAA_CONF_SITE_ID,         $waaSiteId->get_value());
           update_option(self::WAA_CONF_TRACKER_DOMAIN,  $waaTrackerDomain->get_value());