SF.net SVN: phpwiki:[11114] trunk

Revision: 11114
          http://sourceforge.net/p/phpwiki/code/11114
Author:   carstenklapp
Date:     2025-02-16 18:55:10 +0000 (Sun, 16 Feb 2025)
Log Message:
-----------
diff preview when editing a page if there is an edit conflict

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

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2025-02-16 00:36:19 UTC (rev 11113)
+++ trunk/lib/editpage.php	2025-02-16 18:55:10 UTC (rev 11114)
@@ -196,7 +196,9 @@
         }
 
         if ($saveFailed and $this->isConcurrentUpdate()) {
-            // Get the text of the original page, and the two conflicting edits
+             //get a diff preview before inserting merged content into editarea
+             $tokens['PREVIEW_CONTENT'] = $this->getDiff();
+             // Get the text of the original page, and the two conflicting edits
             // The diff3 class takes arrays as input.  So retrieve content as
             // an array, or convert it as necesary.
             $orig = $this->page->getRevision($this->_currentVersion);

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2025-02-16 00:36:19 UTC (rev 11113)
+++ trunk/pgsrc/ReleaseNotes	2025-02-16 18:55:10 UTC (rev 11114)
@@ -1,4 +1,4 @@
-Date: Sat, 15 Feb 2025 23:04:10 +0000
+Date: Sun, 16 Feb 2025 18:37:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -52,6 +52,8 @@
   - Dumped pages now use unix line endings instead of windows. Import of files
     with windows line endings should still work.
 * configurator.php is now in a less-broken state. Useable but needs more work.
+* New: Show a nice diff preview when editing a page if there is an edit
+  conflict.
 
 == 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.