Merge branch 'master' into clean_up_util

Conflicts:
	lib/base.php

diff --cc lib/app.php
Simple merge

diff --cc lib/base.php
index a59fe8b7a48be618c06e685c5aa7dc42578556e6,b5c12a683ffde21e39359ac313015630b8a7a09d..fe160f73652492f24cca5149866a72f8ec0856df
--- 1/lib/base.php
--- 2/lib/base.php
+++ b/lib/base.php
@@@ -777,9 -808,9 +808,9 @@@ class OC 
                                if (defined("DEBUG") && DEBUG) {
                                        OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG);
                                }
 -                              $token = OC_Util::generate_random_bytes(32);
 +                              $token = OC_Util::generateRandomBytes(32);
-                               OC_Preferences::setValue($_POST['user'], 'login_token', $token, time());
-                               OC_User::setMagicInCookie($_POST["user"], $token);
+                               OC_Preferences::setValue($userid, 'login_token', $token, time());
+                               OC_User::setMagicInCookie($userid, $token);
                        } else {
                                OC_User::unsetMagicInCookie();
                        }

diff --cc lib/public/share.php
Simple merge

diff --cc lib/util.php
Simple merge