aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-22 13:08:46 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-22 13:08:46 +0000
commitf17c0d01f4c5ae3869fd10121d2b659c313b0a26 (patch)
treeb4d920b37ed142edb7dcaca9486274c2bd557d75
parent8655a3334d7cee94d4c36baf05401237f7d74dc7 (diff)
downloadelgg-f17c0d01f4c5ae3869fd10121d2b659c313b0a26.tar.gz
elgg-f17c0d01f4c5ae3869fd10121d2b659c313b0a26.tar.bz2
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
-rw-r--r--engine/lib/access.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/lib/access.php b/engine/lib/access.php
index d56eb3dea..f557c939e 100644
--- 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))) {