Merge branch 'release/1.1.17' into v1

nystudio107 · Sep 21, 2022 · 930b5ee · 930b5ee
2 parents 98fc99f + 259521c
commit 930b5ee
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Instant Analytics Changelog
 
+## 1.1.17 - 2022.09.21
+### Fixed
+* Fixed an exception that could be thrown if IA's settings in the CP were not filled in ([#73](https://github.com/nystudio107/craft-instantanalytics/issues/73))
+
 ## 1.1.16 - 2022.09.16
 ### Changed
 * Updated how the Instant Analytics components are registered, to allow for overriding via plugin config ([#1989](https://github.com/craftcms/cms/issues/1989))

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-instantanalytics",
   "description": "Instant Analytics brings full Google Analytics support to your Twig templates and automatic Craft Commerce integration with Google Enhanced Ecommerce",
   "type": "craft-plugin",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "keywords": [
     "craft",
     "cms",

diff --git a/src/InstantAnalytics.php b/src/InstantAnalytics.php
@@ -369,27 +369,25 @@ private function sendPageView()
             // If SEOmatic is installed, set the page title from it
             $this->setTitleFromSeomatic($analytics);
             // Send the page view
-            if ($analytics) {
-                $response = $analytics->sendPageview();
-                Craft::info(
-                    Craft::t(
-                        'instant-analytics',
-                        'pageView sent, response:: {response}',
-                        [
-                            'response' => print_r($response, true),
-                        ]
-                    ),
-                    __METHOD__
-                );
-            } else {
-                Craft::error(
-                    Craft::t(
-                        'instant-analytics',
-                        'Analytics not sent because googleAnalyticsTracking is not set'
-                    ),
-                    __METHOD__
-                );
-            }
+            $response = $analytics->sendPageview();
+            Craft::info(
+                Craft::t(
+                    'instant-analytics',
+                    'pageView sent, response:: {response}',
+                    [
+                        'response' => print_r($response, true),
+                    ]
+                ),
+                __METHOD__
+            );
+        } else {
+            Craft::error(
+                Craft::t(
+                    'instant-analytics',
+                    'Analytics not sent because googleAnalyticsTracking is not set'
+                ),
+                __METHOD__
+            );
         }
     }