Merge pull request #117 from steiha/patch-1

ItemsToRender might return NULL // avoid warnings
silverstripe · Feb 4, 2016 · 04131d5 · 04131d5
2 parents 9aac12a + 65b72e6
commit 04131d5
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/code/model/WidgetArea.php b/code/model/WidgetArea.php
@@ -30,14 +30,15 @@ class WidgetArea extends DataObject
     public function WidgetControllers()
     {
         $controllers = new ArrayList();
+        $items = $this->ItemsToRender();
+        if (!is_null($items)){
+            foreach ($items as $widget) {
+                $controller = $widget->getController();
 
-        foreach ($this->ItemsToRender() as $widget) {
-            $controller = $widget->getController();
-
-            $controller->init();
-            $controllers->push($controller);
+                $controller->init();
+                $controllers->push($controller);
+            }
         }
-
         return $controllers;
     }