merged previous 2 commits into trunk - removes use of session class global

git-svn-id: http://code.elgg.org/elgg/trunk@7420 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/access.php b/engine/lib/access.php
index d56eb3deae076fde350824b9bb523572ce6e668c..f557c939edda8a90d5f860f647c8f802d8e994df 100644 (file)
--- a/engine/lib/access.php
+++ b/engine/lib/access.php
@@ -27,7 +27,7 @@
  * @return string
  */
 function get_access_list($user_id = 0, $site_id = 0, $flush = false) {
-       global $CONFIG, $init_finished, $SESSION;
+       global $CONFIG, $init_finished;
        static $access_list;
 
        if (!isset($access_list) || !$init_finished) {
@@ -35,7 +35,7 @@ function get_access_list($user_id = 0, $site_id = 0, $flush = false) {
        }
 
        if ($user_id == 0) {
-               $user_id = $SESSION['id'];
+               $user_id = get_loggedin_userid();
        }
 
        if (($site_id == 0) && (isset($CONFIG->site_id))) {