3 files changed, 13 insertions, 18 deletions
diff --git a/views/default/page/components/gallery.php b/views/default/page/components/gallery.php
index f03eb1109..e8b3f477e 100644
--- a/views/default/page/components/gallery.php
+++ b/views/default/page/components/gallery.php
@@ -16,7 +16,7 @@
  */
 
 $items = $vars['items'];
-if (!is_array($items) && sizeof($items) == 0) {
+if (!is_array($items) || sizeof($items) == 0) {
 	return true;
 }
 
@@ -39,6 +39,7 @@ if (isset($vars['item_class'])) {
 	$item_class = "$item_class {$vars['item_class']}";
 }
 
+$nav = '';
 if ($pagination && $count) {
 	$nav .= elgg_view('navigation/pagination', array(
 		'offset' => $offset,
diff --git a/views/default/page/components/list.php b/views/default/page/components/list.php
index c83fa0966..c0db50bc5 100644
--- a/views/default/page/components/list.php
+++ b/views/default/page/components/list.php
@@ -17,10 +17,10 @@
  */
 
 $items = $vars['items'];
-$offset = $vars['offset'];
-$limit = $vars['limit'];
-$count = $vars['count'];
-$base_url = $vars['base_url'];
+$offset = elgg_extract('offset', $vars);
+$limit = elgg_extract('limit', $vars);
+$count = elgg_extract('count', $vars);
+$base_url = elgg_extract('base_url', $vars, '');
 $pagination = elgg_extract('pagination', $vars, true);
 $offset_key = elgg_extract('offset_key', $vars, 'offset');
 $position = elgg_extract('position', $vars, 'after');
diff --git a/views/default/page/components/module.php b/views/default/page/components/module.php
index b1198ee9a..7e1eaff20 100644
--- a/views/default/page/components/module.php
+++ b/views/default/page/components/module.php
@@ -2,10 +2,10 @@
 /**
  * Elgg module element
  *
- * @uses $vars['title']        Title text
- * @uses $vars['header']       HTML content of the header
+ * @uses $vars['title']        Optional title text (do not pass header with this option)
+ * @uses $vars['header']       Optional HTML content of the header
  * @uses $vars['body']         HTML content of the body
- * @uses $vars['footer']       HTML content of the footer
+ * @uses $vars['footer']       Optional HTML content of the footer
  * @uses $vars['class']        Optional additional class for module
  * @uses $vars['id']           Optional id for module
  * @uses $vars['show_inner']   Optional flag to leave out inner div (default: false)
@@ -29,21 +29,15 @@ if (isset($vars['id'])) {
 }
 
 if (isset($vars['header'])) {
-	if ($vars['header']) {
-		$header = "<div class=\"elgg-head\">$header</div>";
-	}
-} else {
+	$header = "<div class=\"elgg-head\">$header</div>";
+} elseif ($title) {
 	$header = "<div class=\"elgg-head\"><h3>$title</h3></div>";
 }
 
 $body = "<div class=\"elgg-body\">$body</div>";
 
-if (isset($vars['footer'])) {
-	if ($vars['footer']) {
-		$footer = "<div class=\"elgg-foot\">$footer</div>";
-	}
-} else {
-	$footer = "<div class=\"elgg-foot\"></div>";
+if ($footer) {
+	$footer = "<div class=\"elgg-foot\">$footer</div>";
 }
 
 $contents = $header . $body . $footer;