hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with 3.7

Browse Source
This commit is contained in:
Romain Neutron
2012-10-04 12:49:01 +02:00
parent 832867a2b2 ec450c46f4
commit ba25b8cc7c
48 changed files with 353 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/Session/Handler.class.php
View File

@@ -361,7 +361,7 @@ class Session_Handler
* @param Session_Authentication_Interface $auth
* @return Session_Handler
*/
public function authenticate(Session_Authentication_Interface $auth)
public function authenticate(Session_Authentication_Interface $auth, $persistent = false)
{
if ($this->appbox->get_registry()->get('GV_maintenance')) {
throw new Exception_ServiceUnavailable();
@@ -404,7 +404,9 @@ class Session_Handler
$this->delete_postlog();
$auth->postlog();
$this->add_persistent_cookie();
if ($persistent) {
$this->add_persistent_cookie();
}
self::set_cookie('last_act', '', -400000, true);
return $this;