aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-02-12 15:57:36 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-02-12 15:57:36 +0000
commit32c4a1b060e451df24b34da3132721e7b9370020 (patch)
tree5dd7e8e9f5494e36d7ed30a5133bb247bbac7e6c /engine
parenta254cad13911991d0673122ecd3d76b6973e5d42 (diff)
downloadelgg-32c4a1b060e451df24b34da3132721e7b9370020.tar.gz
elgg-32c4a1b060e451df24b34da3132721e7b9370020.tar.bz2
A minor stabilisation change for river2
git-svn-id: https://code.elgg.org/elgg/trunk@2725 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/river2.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/engine/lib/river2.php b/engine/lib/river2.php
index 577cefc16..3471e3fef 100644
--- a/engine/lib/river2.php
+++ b/engine/lib/river2.php
@@ -131,6 +131,9 @@
$posted_max = 0
) {
+ // Get config
+ global $CONFIG;
+
// Sanitise variables
if (!is_array($subject_guid)) {
$subject_guid = (int) $subject_guid;
@@ -156,7 +159,7 @@
// Construct 'where' clauses for the river
$where = array();
- $where[] = get_access_sql_suffix();
+ $where[] = str_replace("and enabled='yes'",'',str_replace('owner_guid','subject_guid',get_access_sql_suffix()));
if (empty($subject_relationship)) {
if (!empty($subject_guid))