aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xactions/admin.php2
-rwxr-xr-xlib/session.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/actions/admin.php b/actions/admin.php
index a2dbb7af3..bdf3b8261 100755
--- a/actions/admin.php
+++ b/actions/admin.php
@@ -85,6 +85,6 @@ if (isadminloggedin()) {
}
}
-page_draw($title,$body);
+elgg_view_page($title,$body);
?>
diff --git a/lib/session.php b/lib/session.php
index f0f38f7c9..ccd1e8f4c 100755
--- a/lib/session.php
+++ b/lib/session.php
@@ -16,7 +16,7 @@ function init()
{
global $CFG;
- if (isloggedin()) {
+ if (elgg_is_logged_in()) {
setLoggedInUser(normaliseUsername($_SESSION['user']->username));
} else {
setLoggedInUser(null);
@@ -114,7 +114,7 @@ function isTrusted($identity_url, $trust_root, $return_to)
function getLoggedInUser()
{
global $CONFIG;
- if (isloggedin()) {
+ if (elgg_is_logged_in()) {
return $CONFIG->wwwroot.'profile/'.$_SESSION['user']->username;
} else {
return '';