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

diff --git a/views/default/core/river/filter.php b/views/default/core/river/filter.php
index aaa4beb89afd4fd9691a13baef8116b62879e501..7f8b7dec7f753cd9b072b7bd603c7414408a68e2 100644 (file)
--- 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 {