Merge branch 'master' of https://github.com/braekling/WP-Matomo

Author: André Bräkling

classes/WP_Piwik/Widget/Post.php

@@ -41,9 +41,9 @@ public function show() {
                             }
                         }
                         if (isset($result['nb_visits']) && $result['nb_visits'] > 0) {
-                            $result['nb_actions_per_visit'] = round($result['nb_actions'] / $result['nb_visits'], 1);
-                            $result['bounce_rate'] = round($result['bounce_count'] / $result['nb_visits'] * 100, 1) . '%';
-                            $result['avg_time_on_site'] = round($result['sum_visit_length'] / $result['nb_visits'], 0);
+                            $result['nb_actions_per_visit'] = round((isset( $result['nb_actions'] ) ? $result['nb_actions'] : 0) / $result['nb_visits'], 1);
+                            $result['bounce_rate'] = round((isset($result['bounce_count']) ? $result['bounce_count'] : 0) / $result['nb_visits'] * 100, 1) . '%';
+                            $result['avg_time_on_site'] = round((isset($result['sum_visit_length']) ? $result['sum_visit_length'] : 0) / $result['nb_visits'], 0);
                         } else $result['nb_actions_per_visit'] = $result['bounce_rate'] = $result['avg_time_on_site'] = 0;
                     }
                     $response = $result;
@@ -79,4 +79,4 @@ public function show() {
             }
 		}
 
-	}
+	}

proxy/proxy.php

@@ -21,10 +21,16 @@
     include __DIR__ . '/config.local.php';
 }
 
+// Config calls wp-load.php which on multisite networks redeclares and messes up $path
+$wp_matomo_proxy_path=$path;
+
 if (file_exists(__DIR__ . '/config.php')) {
     include __DIR__ . '/config.php';
 }
 
+// Restore $path
+$path=$wp_matomo_proxy_path;
+
 // -----
 // Important: read the instructions in README.md or at:
 // https://github.com/matomo-org/tracker-proxy#matomo-tracker-proxy
@@ -370,4 +376,4 @@ function arrayValue($array, $key, $value = null)
         $value = $array[$key];
     }
     return $value;
-}
+}