Skip to content

Commit 04131d5

Browse files
author
Damian Mooyman
committed
Merge pull request #117 from steiha/patch-1
ItemsToRender might return NULL // avoid warnings
2 parents 9aac12a + 65b72e6 commit 04131d5

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

code/model/WidgetArea.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@ class WidgetArea extends DataObject
3030
public function WidgetControllers()
3131
{
3232
$controllers = new ArrayList();
33+
$items = $this->ItemsToRender();
34+
if (!is_null($items)){
35+
foreach ($items as $widget) {
36+
$controller = $widget->getController();
3337

34-
foreach ($this->ItemsToRender() as $widget) {
35-
$controller = $widget->getController();
36-
37-
$controller->init();
38-
$controllers->push($controller);
38+
$controller->init();
39+
$controllers->push($controller);
40+
}
3941
}
40-
4142
return $controllers;
4243
}
4344

0 commit comments

Comments
 (0)