summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inc/actions.php12
-rw-r--r--inc/auth.php1
2 files changed, 10 insertions, 3 deletions
diff --git a/inc/actions.php b/inc/actions.php
index 694f78208..735179968 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -68,9 +68,15 @@ function act_dispatch(){
}
//update user profile
- if (($ACT == 'profile') && updateprofile()) {
- msg($lang['profchanged'],1);
- $ACT = 'show';
+ if ($ACT == 'profile') {
+ if(!$_SERVER['REMOTE_USER']) {
+ $ACT = 'login';
+ } else {
+ if(updateprofile()) {
+ msg($lang['profchanged'],1);
+ $ACT = 'show';
+ }
+ }
}
//save
diff --git a/inc/auth.php b/inc/auth.php
index 9c21fcbef..18f1ece89 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -724,6 +724,7 @@ function updateprofile() {
if ($changes['pass']) $pass = PMA_blowfish_encrypt($changes['pass'],auth_cookiesalt());
auth_setCookie($_SERVER['REMOTE_USER'],$pass,(bool)$sticky);
+ return true;
}
}