From: <var...@us...> - 2013-06-14 15:54:17
|
Revision: 8810 http://sourceforge.net/p/phpwiki/code/8810 Author: vargenau Date: 2013-06-14 15:54:14 +0000 (Fri, 14 Jun 2013) Log Message: ----------- Do not show message "You are viewing an old revision of this page." when reverting Modified Paths: -------------- trunk/themes/Crao/templates/browse.tmpl trunk/themes/MonoBook/templates/browse.tmpl trunk/themes/Portland/templates/browse.tmpl trunk/themes/Wordpress/templates/browse.tmpl trunk/themes/blog/templates/browse.tmpl trunk/themes/default/templates/browse.tmpl trunk/themes/fusionforge/templates/browse.tmpl Modified: trunk/themes/Crao/templates/browse.tmpl =================================================================== --- trunk/themes/Crao/templates/browse.tmpl 2013-06-14 15:20:44 UTC (rev 8809) +++ trunk/themes/Crao/templates/browse.tmpl 2013-06-14 15:54:14 UTC (rev 8810) @@ -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)?> Modified: trunk/themes/MonoBook/templates/browse.tmpl =================================================================== --- trunk/themes/MonoBook/templates/browse.tmpl 2013-06-14 15:20:44 UTC (rev 8809) +++ trunk/themes/MonoBook/templates/browse.tmpl 2013-06-14 15:54:14 UTC (rev 8810) @@ -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)?> Modified: trunk/themes/Portland/templates/browse.tmpl =================================================================== --- trunk/themes/Portland/templates/browse.tmpl 2013-06-14 15:20:44 UTC (rev 8809) +++ trunk/themes/Portland/templates/browse.tmpl 2013-06-14 15:54:14 UTC (rev 8810) @@ -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> Modified: trunk/themes/Wordpress/templates/browse.tmpl =================================================================== --- trunk/themes/Wordpress/templates/browse.tmpl 2013-06-14 15:20:44 UTC (rev 8809) +++ trunk/themes/Wordpress/templates/browse.tmpl 2013-06-14 15:54:14 UTC (rev 8810) @@ -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> Modified: trunk/themes/blog/templates/browse.tmpl =================================================================== --- trunk/themes/blog/templates/browse.tmpl 2013-06-14 15:20:44 UTC (rev 8809) +++ trunk/themes/blog/templates/browse.tmpl 2013-06-14 15:54:14 UTC (rev 8810) @@ -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)?> Modified: trunk/themes/default/templates/browse.tmpl =================================================================== --- trunk/themes/default/templates/browse.tmpl 2013-06-14 15:20:44 UTC (rev 8809) +++ trunk/themes/default/templates/browse.tmpl 2013-06-14 15:54:14 UTC (rev 8810) @@ -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)?> Modified: trunk/themes/fusionforge/templates/browse.tmpl =================================================================== --- trunk/themes/fusionforge/templates/browse.tmpl 2013-06-14 15:20:44 UTC (rev 8809) +++ trunk/themes/fusionforge/templates/browse.tmpl 2013-06-14 15:54:14 UTC (rev 8810) @@ -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 @@ <?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)?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |