[phpwiki-checkins] SF.net SVN: phpwiki:[11115] trunk

[<car...@us...>]

Revision: 11115
          http://sourceforge.net/p/phpwiki/code/11115
Author:   carstenklapp
Date:     2025-02-16 22:30:49 +0000 (Sun, 16 Feb 2025)
Log Message:
-----------
Prevent diff markers from being rendered as markup when editing a conflict or merging a dumpload.

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

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2025-02-16 18:55:10 UTC (rev 11114)
+++ trunk/lib/diff3.php	2025-02-16 22:30:49 UTC (rev 11115)
@@ -232,11 +232,11 @@
                 // FIXME: this should probably be moved somewhere else...
                 $lines = array_merge(
                     $lines,
-                    array("<<<<<<<" . ($label1 ? " $label1" : '')),
+                    array(" ~<<<<<<<" . ($label1 ? " $label1" : '')),
                     $block->final1,
-                    array("======="),
+                    array(" ~======="),
                     $block->final2,
-                    array(">>>>>>>" . ($label2 ? " $label2" : ''))
+                    array(" ~>>>>>>>" . ($label2 ? " $label2" : ''))
                 );
                 $this->ConflictingBlocks++;
             } else {

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2025-02-16 18:55:10 UTC (rev 11114)
+++ trunk/pgsrc/ReleaseNotes	2025-02-16 22:30:49 UTC (rev 11115)
@@ -1,4 +1,4 @@
-Date: Sun, 16 Feb 2025 18:37:06 +0000
+Date: Sun, 16 Feb 2025 22:23:47 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -52,8 +52,9 @@
   - 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.
+* New: Show a nice diff preview when editing a page if there is an edit conflict.
+* New: Prevent diff markers from being rendered as markup when editing a
+  conflict or merging a dumpload.
 
 == 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.