aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/lib/river.php5
-rw-r--r--engine/tests/api/river.php2
2 files changed, 4 insertions, 3 deletions
diff --git a/engine/lib/river.php b/engine/lib/river.php
index 02d52dea1..421813441 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -207,6 +207,8 @@ function elgg_delete_river(array $options = array()) {
/**
* Get river items
*
+ * @note If using types and subtypes in a query, they are joined with an AND.
+ *
* @param array $options
* ids => INT|ARR River item id(s)
* subject_guids => INT|ARR Subject guid(s)
@@ -430,7 +432,6 @@ function elgg_river_get_access_sql() {
*
* @internal This is a simplified version of elgg_get_entity_type_subtype_where_sql()
* which could be used for all queries once the subtypes have been denormalized.
- * FYI: It allows types and subtypes to not be paired.
*
* @param string $table 'rv'
* @param NULL|array $types Array of types or NULL if none.
@@ -477,7 +478,7 @@ function elgg_get_river_type_subtype_where_sql($table, $types, $subtypes, $pairs
}
if (is_array($subtypes_wheres) && count($subtypes_wheres)) {
- $subtypes_wheres = array(implode(' OR ', $subtypes_wheres));
+ $subtypes_wheres = array('(' . implode(' OR ', $subtypes_wheres) . ')');
}
$wheres = array(implode(' AND ', array_merge($types_wheres, $subtypes_wheres)));
diff --git a/engine/tests/api/river.php b/engine/tests/api/river.php
index 55ddbfeec..6931b9f41 100644
--- a/engine/tests/api/river.php
+++ b/engine/tests/api/river.php
@@ -11,7 +11,7 @@ class ElggCoreRiverAPITest extends ElggCoreUnitTest {
$types = array('object');
$subtypes = array('blog');
$result = elgg_get_river_type_subtype_where_sql('rv', $types, $subtypes, null);
- $this->assertIdentical($result, "((rv.type = 'object') AND (rv.subtype = 'blog'))");
+ $this->assertIdentical($result, "((rv.type = 'object') AND ((rv.subtype = 'blog')))");
$types = array('object');
$subtypes = array('blog', 'file');