Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-03-26 22:33:54 +01:00
commit 4f5a23682a

View File

@ -101,6 +101,11 @@ if (! isset($_COOKIE[$session_name])) {
session_start();
}
/**
* Disable setting of session cookies for further session_start() calls.
*/
@ini_set('session.use_cookies', 'true');
/**
* Token which is used for authenticating access queries.
* (we use "space PMA_token space" to prevent overwriting)