aboutsummaryrefslogtreecommitdiff
path: root/actions/user
diff options
context:
space:
mode:
Diffstat (limited to 'actions/user')
-rw-r--r--actions/user/default_access.php2
-rw-r--r--actions/user/language.php2
-rw-r--r--actions/user/name.php2
-rw-r--r--actions/user/password.php4
-rw-r--r--actions/user/spotlight.php2
5 files changed, 6 insertions, 6 deletions
diff --git a/actions/user/default_access.php b/actions/user/default_access.php
index 0b7d0bfbd..5ddd86296 100644
--- a/actions/user/default_access.php
+++ b/actions/user/default_access.php
@@ -11,7 +11,7 @@ if (elgg_get_config('allow_user_default_access')) {
$user_id = get_input('guid');
if (!$user_id) {
- $user = get_loggedin_user();
+ $user = elgg_get_logged_in_user_entity();
} else {
$user = get_entity($user_id);
}
diff --git a/actions/user/language.php b/actions/user/language.php
index 44c591d7a..30d3b45e8 100644
--- a/actions/user/language.php
+++ b/actions/user/language.php
@@ -10,7 +10,7 @@ $language = get_input('language');
$user_id = get_input('guid');
if (!$user_id) {
- $user = get_loggedin_user();
+ $user = elgg_get_logged_in_user_entity();
} else {
$user = get_entity($user_id);
}
diff --git a/actions/user/name.php b/actions/user/name.php
index e293d409c..881019e86 100644
--- a/actions/user/name.php
+++ b/actions/user/name.php
@@ -10,7 +10,7 @@ $name = strip_tags(get_input('name'));
$user_id = get_input('guid');
if (!$user_id) {
- $user = get_loggedin_user();
+ $user = elgg_get_logged_in_user_entity();
} else {
$user = get_entity($user_id);
}
diff --git a/actions/user/password.php b/actions/user/password.php
index bbeb0ea7f..8619372e4 100644
--- a/actions/user/password.php
+++ b/actions/user/password.php
@@ -12,14 +12,14 @@ $password2 = get_input('password2');
$user_id = get_input('guid');
if (!$user_id) {
- $user = get_loggedin_user();
+ $user = elgg_get_logged_in_user_entity();
} else {
$user = get_entity($user_id);
}
if (($user) && ($password != "")) {
// let admin user change anyone's password without knowing it except his own.
- if (!isadminloggedin() || isadminloggedin() && $user->guid == get_loggedin_userid()) {
+ if (!elgg_is_admin_logged_in() || elgg_is_admin_logged_in() && $user->guid == elgg_get_logged_in_user_guid()) {
$credentials = array(
'username' => $user->username,
'password' => $current_password
diff --git a/actions/user/spotlight.php b/actions/user/spotlight.php
index 390197e78..202dde387 100644
--- a/actions/user/spotlight.php
+++ b/actions/user/spotlight.php
@@ -14,6 +14,6 @@ if ($closed != 'true') {
$closed = true;
}
-get_loggedin_user()->spotlightclosed = $closed;
+elgg_get_logged_in_user_entity()->spotlightclosed = $closed;
// exit as this action is called through Ajax
exit; \ No newline at end of file