refs #5820 added some tests for reports and columns refactoring

2 files changed, 6 insertions, 3 deletions

diff --git a/core/Plugin/Dimension/VisitDimension.php b/core/Plugin/Dimension/VisitDimension.php
index d906bd804f..f293271da8 100644
--- a/core/Plugin/Dimension/VisitDimension.php
+++ b/core/Plugin/Dimension/VisitDimension.php
@@ -71,7 +71,7 @@ abstract class VisitDimension extends Dimension
      */
     public function install()
     {
-        if (!$this->columnType) {
+        if (empty($this->columnType) || empty($this->columnName)) {
             return array();
         }
 
diff --git a/core/Plugin/Report.php b/core/Plugin/Report.php
index 60c9af14d4..2dca75a542 100644
--- a/core/Plugin/Report.php
+++ b/core/Plugin/Report.php
@@ -193,8 +193,11 @@ class Report
     {
         $classname    = get_class($this);
         $parts        = explode('\\', $classname);
-        $this->module = $parts[2];
-        $this->action = lcfirst($parts[4]);
+
+        if (5 === count($parts)) {
+            $this->module = $parts[2];
+            $this->action = lcfirst($parts[4]);
+        }
 
         $this->init();
     }