aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-10-21 07:24:57 -0400
committerCash Costello <cash.costello@gmail.com>2011-10-21 07:24:57 -0400
commit2f2c710cb6027557f5394d34e99b42b4289b5c71 (patch)
tree1288d3bcb9ed267a9a3b9507bbcbf6c77a9bd037
parent4f5d7c0e9d231a9558cf9d4e681351f3bf1b20f2 (diff)
downloadelgg-2f2c710cb6027557f5394d34e99b42b4289b5c71.tar.gz
elgg-2f2c710cb6027557f5394d34e99b42b4289b5c71.tar.bz2
Fixes #3989 fixed access of non-object property in access lib
-rw-r--r--engine/lib/access.php10
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;