aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Chabowski <kevin@kch42.de>2012-07-09 18:23:49 +0200
committerKevin Chabowski <kevin@kch42.de>2012-07-09 18:23:49 +0200
commit44683164ed399d317e69cdf7862ae2dc0d3a170d (patch)
tree9cb851b3e88c5b98accb34e8591c75dd27b6fd3b
parent1dda842bb80414c6d373e7fb41c63d4d31e035b6 (diff)
parent053999cff3b0642b54bbc3610f992700b430074e (diff)
downloadratatoeskr-cms-44683164ed399d317e69cdf7862ae2dc0d3a170d.tar.gz
ratatoeskr-cms-44683164ed399d317e69cdf7862ae2dc0d3a170d.tar.bz2
ratatoeskr-cms-44683164ed399d317e69cdf7862ae2dc0d3a170d.zip
Merge branch 'hotfix' into develop
-rw-r--r--ratatoeskr/backend.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/ratatoeskr/backend.php b/ratatoeskr/backend.php
index be03fc7..2db82d7 100644
--- a/ratatoeskr/backend.php
+++ b/ratatoeskr/backend.php
@@ -118,6 +118,7 @@ $backend_subactions = url_action_subactions(array(
/* Login successful. */
$_SESSION["ratatoeskr_uid"] = $user->get_id();
$_SESSION["ratatoeskr_pwhash"] = $user->pwhash;
+ load_language($user->language);
$data["user"] = $user;
$ste->vars["user"] = array("id" => $user->get_id(), "name" => $user->username, "lang" => $user->language);
}
@@ -134,9 +135,9 @@ $backend_subactions = url_action_subactions(array(
}),
"logout" => url_action_simple(function($data)
{
- echo "foo";
unset($_SESSION["ratatoeskr_uid"]);
unset($_SESSION["ratatoeskr_pwhash"]);
+ load_language();
throw new Redirect(array("login"));
}),
"content" => url_action_subactions(array(