Index: branches/5.3.x/core/kernel/session/session.php =================================================================== diff -u -N -r15912 -r15928 --- branches/5.3.x/core/kernel/session/session.php (.../session.php) (revision 15912) +++ branches/5.3.x/core/kernel/session/session.php (.../session.php) (revision 15928) @@ -1,6 +1,6 @@ SetCookie('cookies_on', 1, adodb_mktime() + 31104000); //one year should be enough + $this->SetCookie('cookies_on', 1, time() + 31104000); //one year should be enough } } else { @@ -371,7 +371,7 @@ */ function SetCookie($name, $value, $expires = null) { - if (isset($expires) && $expires < adodb_mktime()) { + if (isset($expires) && $expires < time()) { unset($this->Application->HttpQuery->Cookie[$name]); } else { @@ -394,7 +394,7 @@ foreach ($old_style_domains as $old_style_domain) { if ($this->CookieDomain != $old_style_domain) { // new style cookie domain -> delete old style cookie to prevent infinite redirect - setcookie($name, $encrypted_value, adodb_mktime() - 3600, $this->CookiePath, $old_style_domain, $this->CookieSecure, true); + setcookie($name, $encrypted_value, time() - 3600, $this->CookiePath, $old_style_domain, $this->CookieSecure, true); } } @@ -426,7 +426,7 @@ $this->Expiration = $this->Storage->GetExpiration(); // If session has expired - if ($this->Expiration < adodb_mktime()) { + if ($this->Expiration < time()) { // when expired session is loaded, then SID is // not assigned, but used in Destroy method $this->SID = $sid; @@ -572,7 +572,7 @@ return true; } - $this->Expiration = adodb_mktime() + $this->SessionTimeout; + $this->Expiration = time() + $this->SessionTimeout; if ( !$force && /*!$this->Application->isAdmin &&*/ !$this->Application->GetVar('admin') && !$this->NeedSession() ) { // don't create session (in db) on Front-End, when sid is present (GPC), but data in db isn't