fixes #1100 - handle malformed dashboard layout

1 files changed, 12 insertions, 6 deletions

diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php
index 11515574a3..6b79a431d3 100644
--- a/plugins/Dashboard/Controller.php
+++ b/plugins/Dashboard/Controller.php
@@ -148,15 +148,21 @@ class Piwik_Dashboard_Controller extends Piwik_Controller
 		{
 			foreach($layoutObject as &$row) 
 			{
+				if(!is_array($row))
+				{
+					$row = array();
+					continue;
+				}
+
 				foreach($row as $widgetId => $widget)
 				{
 					if(isset($widget->parameters->module)) {
-    					$controllerName = $widget->parameters->module;
-    					$controllerAction = $widget->parameters->action;
-    					if(!Piwik_IsWidgetDefined($controllerName, $controllerAction))
-    					{
-    						unset($row[$widgetId]);
-    					}
+						$controllerName = $widget->parameters->module;
+						$controllerAction = $widget->parameters->action;
+						if(!Piwik_IsWidgetDefined($controllerName, $controllerAction))
+						{
+							unset($row[$widgetId]);
+						}
 					}
 				}
 			}