aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-08-21 10:29:20 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-08-21 10:29:20 -0700
commitf280887c7df563dd3af8ad1ccc8f442c2d101264 (patch)
tree452bed8c69afac69f6dd72f6f3fe259969c04d51 /engine
parent7db07d8031955772f129d0b3fc1dbd9f2609454c (diff)
downloadelgg-f280887c7df563dd3af8ad1ccc8f442c2d101264.tar.gz
elgg-f280887c7df563dd3af8ad1ccc8f442c2d101264.tar.bz2
Fixes #3496. Using OR to concatenate unpaired type and subtype clauses in elgg_get_river_type_subtype_where_sql().
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/river.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/lib/river.php b/engine/lib/river.php
index 143ff035f..64ddcfdc1 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -472,7 +472,7 @@ function elgg_get_river_type_subtype_where_sql($table, $types, $subtypes, $pairs
}
if (is_array($wheres) && count($wheres)) {
- $wheres = array(implode(' AND ', $wheres));
+ $wheres = array(implode(' OR ', $wheres));
}
} else {
// using type/subtype pairs