elgg_get_river() doesn't work properly when supplying an array of subtypes

[jtilson]

Nothing is returned by elgg_get_river() if you supply an array of subtypes via the options

The following is an example:

$subtypes = array('blog', 'thewire', 'bookmarks');

$options = array(
    'subtypes' => $subtypes,
);

$river_items = elgg_get_river($options);

Executing the above returns nothing at all, but trying each subtype individually works fine, ie:

$subtypes = array('blog');

I dumped the output of

elgg_get_river_type_subtype_where_sql('rv', $options['types'],
			$options['subtypes'], $options['type_subtype_pairs']);

when running the first block of code, and I received the following SQL:

((rv.subtype = 'blog') AND (rv.subtype = 'bookmarks') AND (rv.subtype = 'thewire'))

Shouldn't this be:

((rv.subtype = 'blog') OR (rv.subtype = 'bookmarks') OR (rv.subtype = 'thewire'))

[cash]

Thanks for debugging this, Jeff. Looks like elgg_get_river_type_subtype_where_sql() has a bug.

[Brett Profitt]

Fixes #3496. Using OR to concatenate unpaired type and subtype clauses in elgg_get_river_type_subtype_where_sql().

Changeset: f280887c7df563dd3af8ad1ccc8f442c2d101264

[jtilson]

Just found a problem with the fix, now when you supply one (or more) subtypes the query will return either: type OR subtype ie:

WHERE ((rv.type = 'object') OR (rv.subtype = 'blog')) OR (rv.subtype = 'thewire'))

This will return just about anything.. We'd actually want something more like:

((rv.type = 'object') AND ((rv.subtype = 'blog') OR (rv.subtype = 'thewire')))

[Danny Navarro]

Refs #3496 improving type/subtype handling for the river

Changeset: 583e52700ca5c7ed1d0dd58054dbd08208c0c158

[cash]

Fixes #3496 finished up this ticket by updating unit test and using more parantheses to make it clear how the OR/AND gets applied

Changeset: 6cc08f83225237d0cd57e0a5c0ebec0a8327aa30

[Danny Navarro]

Refs #3496 improving type/subtype handling for the river

Changeset: d9e595ec0e44a4143c5e50eac8a8f83d66c03569