From 48a06eb1e91cd80f81015a8175f503fcb1a019b5 Mon Sep 17 00:00:00 2001 From: brettp Date: Sun, 20 Feb 2011 19:25:12 +0000 Subject: Refs #2697, #2956. Ported fix to show users and groups in river filter to trunk. git-svn-id: http://code.elgg.org/elgg/trunk@8367 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/core/river/filter.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/views/default/core/river/filter.php b/views/default/core/river/filter.php index aaa4beb89..7f8b7dec7 100644 --- a/views/default/core/river/filter.php +++ b/views/default/core/river/filter.php @@ -9,9 +9,11 @@ $options = array(); $options['type=all'] = elgg_echo('river:select', array(elgg_echo('all'))); $registered_entities = elgg_get_config('registered_entities'); + if (!empty($registered_entities)) { foreach ($registered_entities as $type => $subtypes) { - if (!is_array($subtypes)) { + // subtype will always be an array. + if (!count($subtypes)) { $label = elgg_echo('river:select', array(elgg_echo("item:$type"))); $options["type=$type"] = $label; } else { -- cgit v1.2.3