elgg_get_river - aborts on relationship query, generating invalid SQL

[dannyl]

Running the 1.8 trunk from Feb 8,2011.

elgg_get_river generates invalid SQL and aborts under following conditions:

Calling sequence:
$optionstype? = 'object';
$optionssubtype? = $content;
$optionsrelationship? = 'friend';
$optionsinverse_relationship? = true;
$optionsrelationship_guid? = get_loggedin_userid();
$items = elgg_get_river($options);

Emits invalid SQL referencing a column "e.GUID" that doesn't exist

SELECT count(DISTINCT rv.id) as total FROM elgg_river rv JOIN elgg_entity_relationships r on r.guid_one = e.guid WHERE ((rv.type = 'object') AND (rv.subtype = 'groupforumtopic')) AND (r.relationship = 'friend' AND r.guid_two = '3') AND ( (1 = 1) )

[dannyl]

The code needs to add the elgg_entities e table reference clause as in

$optionsjoins? = array(' ,elgg_entities e');

[cash]

tried this with the latest in svn and it worked:

$options = array(
	'type' => 'object',
	'subtype' => 'blog',
	'relationship' => 'friend',
	'inverse_relationship' => true,
	'relationship_guid' => get_loggedin_userid(),
);
$items = elgg_get_river($options);

The type and subtype are stored in the river table for the object entity. If it doesn't work for you on clean svn checkout, please reopen.