diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-11-14 19:03:58 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-11-14 19:03:58 +0000 |
| commit | 9bd5aad2c3bdb4a283d2b15ed0f91e295099c9e2 (patch) | |
| tree | 8cf4279f57f654d5435dacba4dc2bcb4030d2199 /engine/lib/plugins.php | |
| parent | 2d55e88e095aa1a6b4f58101077aab81788761c9 (diff) | |
| download | elgg-9bd5aad2c3bdb4a283d2b15ed0f91e295099c9e2.tar.gz elgg-9bd5aad2c3bdb4a283d2b15ed0f91e295099c9e2.tar.bz2 | |
* Introducing get_loggedin_user() and get_loggedin_userid()
* ACLs now using get_loggedin_user*
* Some logic cleaned up
* Some "Undefined..." messages cleaned up
git-svn-id: https://code.elgg.org/elgg/trunk@2459 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/plugins.php')
| -rw-r--r-- | engine/lib/plugins.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php index 3cc11f96c..d2381db40 100644 --- a/engine/lib/plugins.php +++ b/engine/lib/plugins.php @@ -320,7 +320,7 @@ if (!$plugin_name) $plugin_name = get_plugin_name(); - if ($user_guid == 0) $user_guid = $_SESSION['user']->guid; + if ($user_guid == 0) $user_guid = get_loggedin_userid(); // Get metadata for user $all_metadata = get_metadata_for_entity($user_guid); @@ -360,10 +360,10 @@ if (!$plugin_name) $plugin_name = get_plugin_name(); - - if ($user_guid == 0) $user_guid = $_SESSION['user']->guid; - + $user = get_entity($user_guid); + if (!$user) $user = get_loggedin_user(); + if (($user) && ($user instanceof ElggUser)) { $prefix = "plugin:settings:$plugin_name:$name"; @@ -391,9 +391,9 @@ if (!$plugin_name) $plugin_name = get_plugin_name(); - if ($user_guid == 0) $user_guid = $_SESSION['user']->guid; - $user = get_entity($user_guid); + if (!$user) $user = get_loggedin_user(); + if (($user) && ($user instanceof ElggUser)) { $prefix = "plugin:settings:$plugin_name:$name"; |