From 3beedd84a7dbcf7a17a75248473302320653d231 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 2 Jul 2011 10:26:39 -0400 Subject: fixed river for #3544 --- engine/lib/river.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engine/lib/river.php') diff --git a/engine/lib/river.php b/engine/lib/river.php index 36dde7f05..1a2be1e50 100644 --- a/engine/lib/river.php +++ b/engine/lib/river.php @@ -589,10 +589,13 @@ function elgg_river_page_handler($page) { elgg_set_page_owner_guid(elgg_get_logged_in_user_guid()); + // make a URL segment available in page handler script $page_type = elgg_extract(0, $page, 'all'); + $page_type = preg_replace('[\W]', '', $page_type); if ($page_type == 'owner') { $page_type = 'mine'; } + set_input('page_type', $page_type); // content filter code here $entity_type = ''; -- cgit v1.2.3 From 105abf94e68860d1d1d06ef6865d21c65f8a4dde Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 6 Jul 2011 07:50:35 -0400 Subject: $joins was not declared in elgg_get_river() --- engine/lib/river.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engine/lib/river.php') diff --git a/engine/lib/river.php b/engine/lib/river.php index 1a2be1e50..143ff035f 100644 --- a/engine/lib/river.php +++ b/engine/lib/river.php @@ -185,6 +185,9 @@ function elgg_delete_river(array $options = array()) { $query = "DELETE rv.* FROM {$CONFIG->dbprefix}river rv "; + // remove identical join clauses + $joins = array_unique($options['joins']); + // add joins foreach ($joins as $j) { $query .= " $j "; -- cgit v1.2.3 From f280887c7df563dd3af8ad1ccc8f442c2d101264 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Sun, 21 Aug 2011 10:29:20 -0700 Subject: Fixes #3496. Using OR to concatenate unpaired type and subtype clauses in elgg_get_river_type_subtype_where_sql(). --- engine/lib/river.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/lib/river.php') 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 -- cgit v1.2.3