SF.net SVN: phpwiki:[11118] trunk

Revision: 11118
          http://sourceforge.net/p/phpwiki/code/11118
Author:   carstenklapp
Date:     2025-02-17 01:24:25 +0000 (Mon, 17 Feb 2025)
Log Message:
-----------
Fixed users unexpectedly being logged out. Affected flatfile database and probably other db types as well. Improved by sanity checking of database global timestamp.

Modified Paths:
--------------
    trunk/lib/WikiDB.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2025-02-16 23:48:35 UTC (rev 11117)
+++ trunk/lib/WikiDB.php	2025-02-17 01:24:25 UTC (rev 11118)
@@ -608,6 +608,9 @@
     public function getTimestamp()
     {
         $ts = $this->get('_timestamp');
+        if (!$ts) { //TODO: does flatfile have global db timestamp?
+            $ts = array(time(), 0);
+        }
         return sprintf("%d %d", $ts[0], $ts[1]);
     }
 
@@ -617,6 +620,9 @@
     public function touch()
     {
         $ts = $this->get('_timestamp');
+        if (!$ts) { //TODO: does flatfile have global db timestamp?
+            $ts = array(time(), 0);
+        }
         $this->set('_timestamp', array(time(), $ts[1] + 1));
     }
 

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2025-02-16 23:48:35 UTC (rev 11117)
+++ trunk/pgsrc/ReleaseNotes	2025-02-17 01:24:25 UTC (rev 11118)
@@ -1,4 +1,4 @@
-Date: Sun, 16 Feb 2025 23:34:56 +0000
+Date: Mon, 17 Feb 2025 01:10:53 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -29,7 +29,7 @@
 * Added 404 error to ~HttpClient.php which is displayed now in
   ~PhotoAlbumPlugin. Removed url of defunct example website that broke
   PhpWikiManual.
-* **Important bugfix for PHP8.3 and newer:** Fixed garbled display of pages
+* **Important bugfix for PHP 8.3 and newer:** Fixed garbled display of pages
   due to depreciated errors. Also try harder to suppress depreciated errors on
   all PHP versions. Set ##DEBUG=2## in ##config.ini## to view depreciated
   errors, and ##DEBUG=1## for basic errors. Added hooks for css formatting of
@@ -58,7 +58,10 @@
   conflict or merging a dumpload.
 * Fixed broken Merge edit functionality when loading dumps, also added diff
   preview. This means themes using custom editpage.tmpl need to be updated
-  with new $EDITING_OLD_REVISION_MESSAGE variable.
+  with new ##$EDITING_OLD_REVISION_MESSAGE## variable.
+* **Important bugfix:** Fixed users unexpectedly being logged out. Affected
+  flatfile database and probably other db types also. Improved by sanity
+  checking of database global timestamp.
 
 == 1.6.4 2024-03-13 Marc-Etienne Vargenau, Christof Meerwald ==
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.