From b6aaba915151dd07800761a01b67ffffaee1302b Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 14 May 2010 20:01:59 +0000
Subject: merge -r5898:5928 (not excluding riverdashboard, notifications, and
 messageboard) from 1.7 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@6058 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/access.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engine/lib/access.php')

diff --git a/engine/lib/access.php b/engine/lib/access.php
index fa9510d7a..fc5081ced 100644
--- a/engine/lib/access.php
+++ b/engine/lib/access.php
@@ -173,7 +173,7 @@ function get_default_access(ElggUser $user = null) {
 		return $CONFIG->default_access;
 	}
 
-	if (!($user) || (!$user = get_loggedin_user())) {
+	if (!($user) && (!$user = get_loggedin_user())) {
 		return $CONFIG->default_access;
 	}
 
-- 
cgit v1.2.3