diff options
| author | cash <cash.costello@gmail.com> | 2011-11-05 19:15:42 -0400 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2011-11-05 19:15:42 -0400 |
| commit | 61d24f4b7b4fd4d5e960593a25a0d96b11891ff0 (patch) | |
| tree | af0128a6f7a99aa92c807bcfad03341c08fd35a6 /views/default/page/layouts | |
| parent | eeade2d2716826b419c1ca67a62a102017c31b02 (diff) | |
| download | elgg-61d24f4b7b4fd4d5e960593a25a0d96b11891ff0.tar.gz elgg-61d24f4b7b4fd4d5e960593a25a0d96b11891ff0.tar.bz2 | |
Fixes #4024 fixed a lot of notices - enough for this release - found a few bugs
Diffstat (limited to 'views/default/page/layouts')
| -rw-r--r-- | views/default/page/layouts/one_column.php | 4 | ||||
| -rw-r--r-- | views/default/page/layouts/widgets.php | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/views/default/page/layouts/one_column.php b/views/default/page/layouts/one_column.php index 7546a4cdf..491d5b459 100644 --- a/views/default/page/layouts/one_column.php +++ b/views/default/page/layouts/one_column.php @@ -30,7 +30,9 @@ $nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs')); echo $vars['content']; // @deprecated 1.8 - echo $vars['area1']; + if (isset($vars['area1'])) { + echo $vars['area1']; + } ?> </div> </div>
\ No newline at end of file diff --git a/views/default/page/layouts/widgets.php b/views/default/page/layouts/widgets.php index b2c54e854..e3819cc20 100644 --- a/views/default/page/layouts/widgets.php +++ b/views/default/page/layouts/widgets.php @@ -39,10 +39,14 @@ echo $vars['content']; $widget_class = "elgg-col-1of{$num_columns}"; for ($column_index = 1; $column_index <= $num_columns; $column_index++) { - $column_widgets = $widgets[$column_index]; + if (isset($widgets[$column_index])) { + $column_widgets = $widgets[$column_index]; + } else { + $column_widgets = array(); + } echo "<div class=\"$widget_class elgg-widgets\" id=\"elgg-widget-col-$column_index\">"; - if (is_array($column_widgets) && sizeof($column_widgets) > 0) { + if (sizeof($column_widgets) > 0) { foreach ($column_widgets as $widget) { if (array_key_exists($widget->handler, $widget_types)) { echo elgg_view_entity($widget, array('show_access' => $show_access)); |