Merge branch 'master' of github.com:Elgg/Elgg

1 files changed, 5 insertions, 5 deletions

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;