diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/access.php | 2 | ||||
| -rw-r--r-- | engine/lib/elgglib.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/engine/lib/access.php b/engine/lib/access.php index 2341e3cb2..45aa49962 100644 --- a/engine/lib/access.php +++ b/engine/lib/access.php @@ -237,7 +237,7 @@ END; $friends_bit .= "{$table_prefix}owner_guid IN (SELECT guid_one FROM {$CONFIG->dbprefix}entity_relationships WHERE relationship='friend' AND guid_two=$owner)";
$friends_bit = '('.$friends_bit.') OR ';
- if ($CONFIG->user_block_and_filter_enabled) {
+ if ((isset($CONFIG->user_block_and_filter_enabled)) && ($CONFIG->user_block_and_filter_enabled)) {
// check to see if the user is in the entity owner's block list
// or if the entity owner is in the user's filter list
// if so, disallow access
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 392f6cd8b..2db75b6f7 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -317,6 +317,9 @@ global $CONFIG; + if (!isset($CONFIG->views)) + $CONFIG->views = new stdClass; + if (!isset($CONFIG->views->simplecache)) $CONFIG->views->simplecache = array(); |