cannot filter activity by user or group due to no subtype

[milan]

In a previous version of Elgg (at least 1.6, not sure about 1.7 releases) I was able to filter by user and group in activity. In the current version I am using 1.7.5

I can't now as when user and groups are registered as entity types (i.e. register_entity_type('user', ) & register_entity_type('group', )) because they have no subtype the register_entity_type() function doesn't store an empty subtype as it previously did (which I think is kindof fair enough).

In the riverdashboard/nav view this will now cause the $keyname variable never to be set as there is nothing to be looped in the foreach i.e.

if (!empty($vars['config']->registered_entities)) {
	foreach ($vars['config']->registered_entities as $type => $ar) {
                // NEVER WILL GET INTO THE LOOP BELOW FOR USER AND GROUPS
		foreach ($vars['config']->registered_entities[$type] as $object) {
			if (!empty($object )) {
				$keyname = 'item:' . $type . ':' . $object;
			} else {
				$keyname = 'item:' . $type;
			}
			$contents[$keyname] = "{$type},{$object}";
		}
	}
}

I propose this loop should be changed to allow types without subtypes to be allowed as a filter i.e.

if (!empty($vars['config']->registered_entities)) {
	foreach ($vars['config']->registered_entities as $type => $ar) {
		if (count($vars['config']->registered_entities[$type])) {
			foreach ($vars['config']->registered_entities[$type] as $object) {
				if (!empty($object )) {
					$keyname = 'item:' . $type . ':' . $object;
				} else {
					$keyname = 'item:' . $type;
				}
				$contents[$keyname] = "{$type},{$object}";
			}
		} else {
			$keyname = 'item:' . $type;
			$contents[$keyname] = "{$type},{$object}";
		}
	}
}

[cash]

(In [svn:7968]) Fixes #2697 added groups and users back to activity filter

[brettp]

(In [svn:8367]) Refs #2697, #2956. Ported fix to show users and groups in river filter to trunk.