From 2f2c710cb6027557f5394d34e99b42b4289b5c71 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Fri, 21 Oct 2011 07:24:57 -0400
Subject: Fixes #3989 fixed access of non-object property in access lib

---
 engine/lib/access.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engine/lib')

diff --git a/engine/lib/access.php b/engine/lib/access.php
index ae64f832a..002413baa 100644
--- a/engine/lib/access.php
+++ b/engine/lib/access.php
@@ -981,17 +981,17 @@ function access_init() {
  */
 function elgg_override_permissions($hook, $type, $value, $params) {
 	$user = elgg_extract('user', $params);
-	if (!$user) {
-		$user = elgg_get_logged_in_user_entity();
+	if ($user) {
+		$user_guid = $user->getGUID();
+	} else {
+		$user_guid = elgg_get_logged_in_user_guid();
 	}
 
-	// don't do this so ignore access still works.
+	// don't do this so ignore access still works with no one logged in
 //	if (!$user instanceof ElggUser) {
 //		return false;
 //	}
 
-	$user_guid = $user->guid;
-
 	// check for admin
 	if ($user_guid && elgg_is_admin_user($user_guid)) {
 		return true;
-- 
cgit v1.2.3