aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2012-12-18 16:18:02 -0500
committerBrett Profitt <brett.profitt@gmail.com>2012-12-18 16:18:02 -0500
commita4d91991b7e172378370f995835fc329bad56b38 (patch)
tree48138082fa507ff74126032207123e4a83dee17b /views
parent2b08c9d03b803c8227a99a4c3fce3ecb84ed6fc4 (diff)
parentd764446654f2c590391841ae25a9d22166b556ee (diff)
downloadelgg-a4d91991b7e172378370f995835fc329bad56b38.tar.gz
elgg-a4d91991b7e172378370f995835fc329bad56b38.tar.bz2
Merge branch 'pr-380' into 1.8
Diffstat (limited to 'views')
-rw-r--r--views/default/page/components/list.php15
1 files changed, 8 insertions, 7 deletions
diff --git a/views/default/page/components/list.php b/views/default/page/components/list.php
index 0cf7d507c..28ed58ddf 100644
--- a/views/default/page/components/list.php
+++ b/views/default/page/components/list.php
@@ -51,14 +51,15 @@ if ($pagination && $count) {
if (is_array($items) && count($items) > 0) {
$html .= "<ul class=\"$list_class\">";
foreach ($items as $item) {
- if (elgg_instanceof($item)) {
- $id = "elgg-{$item->getType()}-{$item->getGUID()}";
- } else {
- $id = "item-{$item->getType()}-{$item->id}";
+ $li = elgg_view_list_item($item, $vars);
+ if ($li) {
+ if (elgg_instanceof($item)) {
+ $id = "elgg-{$item->getType()}-{$item->getGUID()}";
+ } else {
+ $id = "item-{$item->getType()}-{$item->id}";
+ }
+ $html .= "<li id=\"$id\" class=\"$item_class\">$li</li>";
}
- $html .= "<li id=\"$id\" class=\"$item_class\">";
- $html .= elgg_view_list_item($item, $vars);
- $html .= '</li>';
}
$html .= '</ul>';
}