From 812c244d018fbcc64a6add0c46905bce3f807fd4 Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Fri, 14 Jun 2013 15:54:14 +0000
Subject: [PATCH] Do not show message "You are viewing an old revision of this
 page." when reverting

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8810 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 themes/Crao/templates/browse.tmpl        | 5 ++++-
 themes/MonoBook/templates/browse.tmpl    | 5 ++++-
 themes/Portland/templates/browse.tmpl    | 5 ++++-
 themes/Wordpress/templates/browse.tmpl   | 5 ++++-
 themes/blog/templates/browse.tmpl        | 5 ++++-
 themes/default/templates/browse.tmpl     | 5 ++++-
 themes/fusionforge/templates/browse.tmpl | 3 ++-
 7 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/themes/Crao/templates/browse.tmpl b/themes/Crao/templates/browse.tmpl
index e2f3222ac..eee298aa0 100644
--- a/themes/Crao/templates/browse.tmpl
+++ b/themes/Crao/templates/browse.tmpl
@@ -1,4 +1,7 @@
-<?php if ($revision and !$revision->isCurrent()) { ?>
+<?php
+$action = $request->getArg('action');
+?>
+<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
   <p><strong><?php echo _("Note:")?></strong>
      <?php echo _("You are viewing an old revision of this page.")?>
   <?php echo Button('browse', _("View the current version."), $page)?>
diff --git a/themes/MonoBook/templates/browse.tmpl b/themes/MonoBook/templates/browse.tmpl
index c0ae8f167..cf0713311 100644
--- a/themes/MonoBook/templates/browse.tmpl
+++ b/themes/MonoBook/templates/browse.tmpl
@@ -1,4 +1,7 @@
-<?php if ($revision and !$revision->isCurrent()) { ?>
+<?php
+$action = $request->getArg('action');
+?>
+<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
   <p><strong><?php echo _("Note:")?></strong>
      <?php echo _("You are viewing an old revision of this page.")?>
   <?php echo Button('browse', _("View the current version."), $page)?>
diff --git a/themes/Portland/templates/browse.tmpl b/themes/Portland/templates/browse.tmpl
index 26ac31cd1..8852f43d1 100644
--- a/themes/Portland/templates/browse.tmpl
+++ b/themes/Portland/templates/browse.tmpl
@@ -1,6 +1,9 @@
+<?php
+$action = $request->getArg('action');
+?>
 <br class="clear-floats" />
 
-<?php if ($revision and !$revision->isCurrent()) { ?>
+<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
   <p><strong><?php echo _("Note:")?></strong>
      <?php echo _("You are viewing an old revision of this page.")?>
      <?php echo WikiLink($page, 'existing', _("View the current version."))?></p>
diff --git a/themes/Wordpress/templates/browse.tmpl b/themes/Wordpress/templates/browse.tmpl
index 537355ce3..c859784d6 100644
--- a/themes/Wordpress/templates/browse.tmpl
+++ b/themes/Wordpress/templates/browse.tmpl
@@ -1,6 +1,9 @@
+<?php
+$action = $request->getArg('action');
+?>
 <br class="clear-floats" />
 
-<?php if ($revision and !$revision->isCurrent()) { ?>
+<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
   <p><strong><?php echo _("Note:")?></strong>
      <?php echo _("You are viewing an old revision of this page.")?>
      <?php echo WikiLink($page, 'existing', _("View the current version."))?>.</p>
diff --git a/themes/blog/templates/browse.tmpl b/themes/blog/templates/browse.tmpl
index 7b4004739..17b4e0e86 100644
--- a/themes/blog/templates/browse.tmpl
+++ b/themes/blog/templates/browse.tmpl
@@ -1,4 +1,7 @@
-<?php if ($revision and !$revision->isCurrent()) { ?>
+<?php
+$action = $request->getArg('action');
+?>
+<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
   <p><strong><?php echo _("Note:")?></strong>
      <?php echo _("You are viewing an old revision of this page.")?>
   <?php echo Button('browse', _("View the current version."), $page)?>
diff --git a/themes/default/templates/browse.tmpl b/themes/default/templates/browse.tmpl
index 01665187d..5fb253b59 100644
--- a/themes/default/templates/browse.tmpl
+++ b/themes/default/templates/browse.tmpl
@@ -1,4 +1,7 @@
-<?php if ($revision and !$revision->isCurrent()) { ?>
+<?php
+$action = $request->getArg('action');
+?>
+<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
   <p><strong><?php echo _("Note:")?></strong>
      <?php echo _("You are viewing an old revision of this page.")?>
   <?php echo Button('browse', _("View the current version."), $page)?>
diff --git a/themes/fusionforge/templates/browse.tmpl b/themes/fusionforge/templates/browse.tmpl
index de5a19cb1..c4178202f 100644
--- a/themes/fusionforge/templates/browse.tmpl
+++ b/themes/fusionforge/templates/browse.tmpl
@@ -1,5 +1,6 @@
 <?php
 $curuserprefs = $user->getPreferences();
+$action = $request->getArg('action');
 ?>
 
 <?php if ($page->exists() and $revision and $revision->hasDefaultContents()) { ?>
@@ -8,7 +9,7 @@ $curuserprefs = $user->getPreferences();
   <?php echo Button('browse', _("View the current version."), $page)?>
   </p>
 <?php } else { ?>
-<?php if ($revision and !$revision->isCurrent()) { ?>
+<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
   <p class="warning_msg"><?php echo _("Note:")?>
   <?php echo _("You are viewing an old revision of this page.")?>
   <?php echo Button('browse', _("View the current version."), $page)?>
-- 
2.42.0