Property changes on: upload
___________________________________________________________________
Name: svn:ignore
   + *



Property changes on: cache
___________________________________________________________________
Name: svn:ignore
   + *


Index: application/models/CompanyWebsite.class.php
===================================================================
--- application/models/CompanyWebsite.class.php	(revision 146)
+++ application/models/CompanyWebsite.class.php	(working copy)
@@ -223,7 +223,7 @@
         $user->save();
       } // if
       
-      $expiration = $remember ? REMEMBER_LOGIN_LIFETIME : SESSION_LIFETIME;
+      $expiration = $remember ? REMEMBER_LOGIN_LIFETIME : null;
       
       Cookie::setValue('id'.TOKEN_COOKIE_NAME, $user->getId(), $expiration);
       Cookie::setValue(TOKEN_COOKIE_NAME, $user->getTwistedToken(), $expiration);
Index: environment/classes/Cookie.class.php
===================================================================
--- environment/classes/Cookie.class.php	(revision 146)
+++ environment/classes/Cookie.class.php	(working copy)
@@ -28,6 +28,7 @@
     * @return null
     */
     static function setValue($name, $value, $expiration = null) {
+      
       $expiration_time = DateTimeValueLib::now();
       if ((integer) $expiration > 0) {
         $expiration_time->advance($expiration);
@@ -35,11 +36,14 @@
         $expiration_time->advance(3600); // one hour
       } // if
       
+      // if $expiration is null, set the cookie to expire when the session is over
+      $expiration_timestamp = is_null($expiration) ? null : $expiration_time->getTimestamp();
+
       $path = defined('COOKIE_PATH') ? COOKIE_PATH : '/';
       $domain = defined('COOKIE_DOMAIN') ? COOKIE_DOMAIN : '';
       $secure = defined('COOKIE_SECURE') ? COOKIE_SECURE : false;
       
-      setcookie($name, $value, $expiration_time->getTimestamp(), $path, $domain, $secure);
+      setcookie($name, $value, $expiration_timestamp, $path, $domain, $secure);
     } // setValue
     
     /**

Property changes on: config
___________________________________________________________________
Name: svn:ignore
   + *



Property changes on: public/assets/themes
___________________________________________________________________
Name: svn:ignore
   + *