summaryrefslogtreecommitdiffstats
path: root/index.php
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2011-12-16 17:43:06 +0100
committerThomas Tanghus <thomas@tanghus.net>2011-12-16 17:43:06 +0100
commitf3e8776dc63656d99c39c007c230a80c0c9e384b (patch)
treeb0debedaf5d4d65477083b40d117d2bb4142ed2b /index.php
parentfeeb0c742a57eb542f6e904dd4c8b5310bcc066a (diff)
parentdc641943d9245b371eca1928a64bcadfe72f9cf6 (diff)
downloadnextcloud-server-f3e8776dc63656d99c39c007c230a80c0c9e384b.tar.gz
nextcloud-server-f3e8776dc63656d99c39c007c230a80c0c9e384b.zip
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
Diffstat (limited to 'index.php')
-rw-r--r--index.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/index.php b/index.php
index 7ead0fb48a7..9bd460be353 100644
--- a/index.php
+++ b/index.php
@@ -88,7 +88,7 @@ else {
if(defined("DEBUG") && DEBUG) {
OC_Log::write('core','Setting remember login to cookie',OC_Log::DEBUG);
}
- $token = md5($_POST["user"].time());
+ $token = md5($_POST["user"].time().$_POST['password']);
OC_Preferences::setValue($_POST['user'], 'login', 'token', $token);
OC_User::setMagicInCookie($_POST["user"], $token);
}