[geeklog-cvs] geeklog: The "Remember Me For" option under My Account did not r...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4517558ab25c
changeset: 7276:4517558ab25c
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu Sep 03 20:32:24 2009 +0200
description:
The "Remember Me For" option under My Account did not recognize the "(don't)" option any more (bug #0000961)

diffstat:

 public_html/docs/history     |   2 ++
 public_html/usersettings.php |  10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r fecf9cc82e81 -r 4517558ab25c public_html/docs/history
--- a/public_html/docs/history	Mon Aug 31 20:15:48 2009 +0200
+++ b/public_html/docs/history	Thu Sep 03 20:32:24 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- The "Remember Me For" option under My Account did not recognize the "(don't)"
+  option any more (bug #0000961) [Dirk]
 - Send a notification when a comment goes into the submission queue [Dirk]
 - Added a link back to the story to the "Mail Story to a Friend" form [Dirk]
 - Only list [code], [raw] tags when story.* permissions are required [Dirk]
diff -r fecf9cc82e81 -r 4517558ab25c public_html/usersettings.php
--- a/public_html/usersettings.php	Mon Aug 31 20:15:48 2009 +0200
+++ b/public_html/usersettings.php	Thu Sep 03 20:32:24 2009 +0200
@@ -878,15 +878,15 @@
         return COM_refresh ($_CONF['site_url'] . '/index.php');
     }
 
-    // If not set or possibly removed from template - initialize variable
-    if (!isset($A['cooktime'])) {
-        $A['cooktime'] = 0;
+    if (! isset($A['cooktime'])) {
+        // If not set or possibly removed from template - set to default
+        $A['cooktime'] = $_CONF['default_perm_cookie_timeout'];
     } else {
-        $A['cooktime'] = COM_applyFilter ($A['cooktime'], true);
+        $A['cooktime'] = COM_applyFilter($A['cooktime'], true);
     }
     // If empty or invalid - set to user default
     // So code after this does not fail the user password required test
-    if (empty($A['cooktime']) OR $A['cooktime'] < 0) {
+    if ($A['cooktime'] < 0) { // note that == 0 is allowed!
         $A['cooktime'] = $_USER['cookietimeout'];
     }