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

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

Revision: 11117
          http://sourceforge.net/p/phpwiki/code/11117
Author:   carstenklapp
Date:     2025-02-16 23:48:35 +0000 (Sun, 16 Feb 2025)
Log Message:
-----------
Updating custom theme editpage.tmpl with new $EDITING_OLD_REVISION_MESSAGE variable.

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes
    trunk/themes/Crao/templates/editpage.tmpl
    trunk/themes/Portland/templates/editpage.tmpl
    trunk/themes/Wordpress/templates/editpage.tmpl
    trunk/themes/fusionforge/templates/editpage.tmpl

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2025-02-16 23:10:14 UTC (rev 11116)
+++ trunk/pgsrc/ReleaseNotes	2025-02-16 23:48:35 UTC (rev 11117)
@@ -1,4 +1,4 @@
-Date: Sun, 16 Feb 2025 22:40:56 +0000
+Date: Sun, 16 Feb 2025 23:34:56 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -57,7 +57,8 @@
 * New: Prevent diff markers from being rendered as markup when editing a
   conflict or merging a dumpload.
 * Fixed broken Merge edit functionality when loading dumps, also added diff
-  preview.
+  preview. This means themes using custom editpage.tmpl need to be updated
+  with new $EDITING_OLD_REVISION_MESSAGE variable.
 
 == 1.6.4 2024-03-13 Marc-Etienne Vargenau, Christof Meerwald ==
 

Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl	2025-02-16 23:10:14 UTC (rev 11116)
+++ trunk/themes/Crao/templates/editpage.tmpl	2025-02-16 23:48:35 UTC (rev 11117)
@@ -9,13 +9,7 @@
 <?php } ?>
 <?php echo $PAGE_LOCKED_MESSAGE ?>
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-<?php if (!$revision->isCurrent() && !$revision->hasDefaultContents()) { ?>
-      <p class="warning_msg">
-      <strong><?php echo _("Warning")._(": ") ?></strong>
-      <?php echo _("You are editing an old version.") ?>
-      <?php echo _("Saving this page will overwrite the current version.") ?>
-      </p>
-<?php } ?>
+<?php echo $EDITING_OLD_REVISION_MESSAGE ?>
 <script type="text/javascript">
 <!--//
 $(document).ready(function() {

Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2025-02-16 23:10:14 UTC (rev 11116)
+++ trunk/themes/Portland/templates/editpage.tmpl	2025-02-16 23:48:35 UTC (rev 11117)
@@ -6,13 +6,7 @@
 <td>
 <?php echo $PAGE_LOCKED_MESSAGE ?>
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-<?php if (!$revision->isCurrent() && !$revision->hasDefaultContents()) { ?>
-      <p class="warning_msg">
-      <strong><?php echo _("Warning")._(": ") ?></strong>
-      <?php echo _("You are editing an old version.") ?>
-      <?php echo _("Saving this page will overwrite the current version.") ?>
-      </p>
-<?php } ?>
+<?php echo $EDITING_OLD_REVISION_MESSAGE ?>
 <script type="text/javascript">
 <!--//
 $(document).ready(function() {

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2025-02-16 23:10:14 UTC (rev 11116)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2025-02-16 23:48:35 UTC (rev 11117)
@@ -8,13 +8,7 @@
 <td>
 <?php echo $PAGE_LOCKED_MESSAGE ?>
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-<?php if (!$revision->isCurrent() && !$revision->hasDefaultContents()) { ?>
-      <p class="warning_msg">
-      <strong><?php echo _("Warning")._(": ") ?></strong>
-      <?php echo _("You are editing an old version.") ?>
-      <?php echo _("Saving this page will overwrite the current version.") ?>
-      </p>
-<?php } ?>
+<?php echo $EDITING_OLD_REVISION_MESSAGE ?>
 <script type="text/javascript">
 <!--//
 $(document).ready(function() {

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2025-02-16 23:10:14 UTC (rev 11116)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2025-02-16 23:48:35 UTC (rev 11117)
@@ -7,13 +7,7 @@
 <?php } ?>
 <?php echo $PAGE_LOCKED_MESSAGE ?>
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-<?php if (!$revision->isCurrent() && !$revision->hasDefaultContents()) { ?>
-      <p class="warning_msg">
-      <strong><?php echo _("Warning")._(": ") ?></strong>
-      <?php echo _("You are editing an old version.") ?>
-      <?php echo _("Saving this page will overwrite the current version.") ?>
-      </p>
-<?php } ?>
+<?php echo $EDITING_OLD_REVISION_MESSAGE ?>
 <?php if (forge_get_config('use_jquery_form_navigate')) { ?>
 <script type="text/javascript">
 <!--//

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