aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-02 12:38:01 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-02 12:38:01 +0000
commit0031f32eca01454b370810968356fe7d7ca9fa48 (patch)
tree372a2a61a27f4392eda042460ccd76263fb6166f /engine
parenta2224165795320235ebe3505d048ff57f319f365 (diff)
downloadelgg-0031f32eca01454b370810968356fe7d7ca9fa48.tar.gz
elgg-0031f32eca01454b370810968356fe7d7ca9fa48.tar.bz2
Fixes #2844 setting table for access_id to fix fatal error
git-svn-id: http://code.elgg.org/elgg/trunk@7989 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/river.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/engine/lib/river.php b/engine/lib/river.php
index 036ceafd4..fd6e97b12 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -373,7 +373,8 @@ 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', 'subject_guid', get_access_sql_suffix()));
+ str_replace('owner_guid', 'rv.subject_guid',
+ str_replace('access_id', 'rv.access_id', get_access_sql_suffix())));
}
/**