diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-04-18 19:54:17 -0400 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-04-18 19:54:17 -0400 |
| commit | 0d9c5c1ccd66018a819b4ca327ab203f473e35dc (patch) | |
| tree | f55e5caa8bf8036b02fc553eecd2b615791d2ce5 /engine/lib/river.php | |
| parent | ca63a6b81eee1dfbee99a393a790402475a4612c (diff) | |
| parent | d928588805375e7190ab393e2def555b39701a27 (diff) | |
| download | elgg-0d9c5c1ccd66018a819b4ca327ab203f473e35dc.tar.gz elgg-0d9c5c1ccd66018a819b4ca327ab203f473e35dc.tar.bz2 | |
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'engine/lib/river.php')
| -rw-r--r-- | engine/lib/river.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/lib/river.php b/engine/lib/river.php index 55d1c783a..80f285e50 100644 --- a/engine/lib/river.php +++ b/engine/lib/river.php @@ -302,7 +302,7 @@ function elgg_get_river(array $options = array()) { if ($options['limit']) { $limit = sanitise_int($options['limit']); - $offset = sanitise_int($options['offset']); + $offset = sanitise_int($options['offset'], false); $query .= " LIMIT $offset, $limit"; } @@ -375,7 +375,7 @@ function elgg_row_to_elgg_river_item($row) { function elgg_river_get_access_sql() { // rewrite default access where clause to work with river table return str_replace("and enabled='yes'", '', - str_replace('owner_guid', 'rv.subject_guid', + str_replace('owner_guid', 'rv.subject_guid', str_replace('access_id', 'rv.access_id', get_access_sql_suffix()))); } |