aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-20 19:25:12 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-20 19:25:12 +0000
commit48a06eb1e91cd80f81015a8175f503fcb1a019b5 (patch)
tree7d1e5f4618ad093667c6214e3ff3bf69052aabc0
parent428cf8e4d0012a01247fc8365d25a3a83cf45ccc (diff)
downloadelgg-48a06eb1e91cd80f81015a8175f503fcb1a019b5.tar.gz
elgg-48a06eb1e91cd80f81015a8175f503fcb1a019b5.tar.bz2
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
-rw-r--r--views/default/core/river/filter.php4
1 files changed, 3 insertions, 1 deletions
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 {