From f7158fccc484f936ed49e50237097aef68eea9e7 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Tue, 2 Jan 2007 13:29:40 +0000
Subject: [PATCH] fix revision can be empty, replace Sep by SEP

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@5324 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 themes/Crao/templates/actionbar.tmpl        | 26 ++++++++++-----------
 themes/Portland/templates/actionbar.tmpl    | 20 +++++++---------
 themes/Portland/templates/navbar.tmpl       | 15 +++++-------
 themes/shamino_com/templates/actionbar.tmpl | 22 ++++++++---------
 4 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/themes/Crao/templates/actionbar.tmpl b/themes/Crao/templates/actionbar.tmpl
index 786a4cd2d..fec76bcf0 100644
--- a/themes/Crao/templates/actionbar.tmpl
+++ b/themes/Crao/templates/actionbar.tmpl
@@ -1,39 +1,39 @@
 <?php // -*-php-*-
-  rcs_id('$Id: actionbar.tmpl,v 1.4 2005-01-25 07:24:17 rurban Exp $');
+  rcs_id('$Id: actionbar.tmpl,v 1.5 2007-01-02 13:29:39 rurban Exp $');
   if (!$page->get('locked') || $user->isAdmin() and $revision)
       $EditB = Button("edit",
                       $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));
   else
       $EditB = Button("viewsource", _("View Source"));
-  $Sep = $WikiTheme->getButtonSeparator();
+  if (empty($revision)) $revision = $page->getCurrentRevision(false);
 //MSIE needs sticky.js
 ?>
 <div <?= isBrowserIE() ? "class=ie-actionbuttons" : "id=actionbuttons"?>>
 <?= $EditB ?>
 <?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?>
-<?=$Sep?><?= Button($page->get('locked') ? 'unlock' : 'lock') ?>
+<?=$SEP?><?= Button($page->get('locked') ? 'unlock' : 'lock') ?>
 <?php if (ENABLE_PAGEPERM) { ?>
-<?=$Sep?><?= Button('chown') ?>
-<?=$Sep?><?= Button('setacl') ?>
+<?=$SEP?><?= Button('chown') ?>
+<?=$SEP?><?= Button('setacl') ?>
 <?php }} ?>
 <?php if ($user->isAdmin() or mayAccessPage('remove',$page->getName())) { ?>
-<?=$Sep?><?= Button('remove') ?>
+<?=$SEP?><?= Button('remove') ?>
 <?php } ?>
-<?=$Sep?><?= Button("PageHistory", _("PageHistory")) ?>
-<?=$Sep?><?= Button("diff") ?> 
-<?=$Sep?><?= Button("PageInfo", _("PageInfo")) ?>
+<?=$SEP?><?= Button("PageHistory", _("PageHistory")) ?>
+<?=$SEP?><?= Button("diff") ?> 
+<?=$SEP?><?= Button("PageInfo", _("PageInfo")) ?>
 <?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?> 
 <!-- Buttons really only for debugging -->
-<?=$Sep?><?= Button("DebugInfo", _("DebugInfo")) ?>
-<?=$Sep?><?= Button("PageDump", _("PageDump")) ?>
+<?=$SEP?><?= Button("DebugInfo", _("DebugInfo")) ?>
+<?=$SEP?><?= Button("PageDump", _("PageDump")) ?>
 <?php $purgeb = Button(array('nocache' => 'purge'),
                        _("PurgeHtmlCache"), $page->getName());
       $purgeb->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
 ?>
-<?=$Sep?><?= $purgeb ?>
+<?=$SEP?><?= $purgeb ?>
     <!-- End debugging buttons -->
 <?php } ?>
 <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?> 
-    <?=$Sep?><?= Button("pdf") ?>
+    <?=$SEP?><?= Button("pdf") ?>
 <?php } ?>
 </div>
diff --git a/themes/Portland/templates/actionbar.tmpl b/themes/Portland/templates/actionbar.tmpl
index fc2328d02..aae7b3e4c 100644
--- a/themes/Portland/templates/actionbar.tmpl
+++ b/themes/Portland/templates/actionbar.tmpl
@@ -1,23 +1,19 @@
-<?php // -*-html-*- ?>
-<!-- $Id: actionbar.tmpl,v 1.20 2004-06-14 11:26:50 rurban Exp $ -->
+<?php // -*-php-*- ?>
+<!-- $Id: actionbar.tmpl,v 1.21 2007-01-02 13:29:40 rurban Exp $ -->
 <?php
-  $Sep = $WikiTheme->getButtonSeparator();
-
-  if (!$page->get('locked') || $user->isAdmin())
+  if ($revision and (!$page->get('locked') || $user->isAdmin()))
       $EditB = Button("edit",
                       $revision->isCurrent() ? _("EditText") : _("Edit Old Revision"));
   else
       $EditB = Button("viewsource", _("View Source"));
   $EditB = fmt("%s of this page", $EditB);
-
+  if (empty($revision)) $revision = $page->getCurrentRevision(false);
 ?>
-
 <?= $EditB ?> 
-<a href="<?=WikiURL($revision,array('action'=>'diff'))?>"
-   ><?= $WikiTheme->getLastModifiedMessage($revision) ?></a>
-	<?=$Sep?><?= Button("PageHistory", _("PageHistory")) ?>
-    <?=$Sep?><?= Button("PageInfo", _("PageInfo")) ?>
+<a href="<?=WikiURL($revision,array('action'=>'diff'))?>"><?= $WikiTheme->getLastModifiedMessage($revision) ?></a>
+    <?=$SEP?><?= Button("PageHistory", _("PageHistory")) ?>
+    <?=$SEP?><?= Button("PageInfo", _("PageInfo")) ?>
 <?php if (defined('DEBUG') && DEBUG || $user->isAdmin()) { ?>
-	<?=$Sep?><?= Button("DebugInfo", _("DebugInfo")) ?> <!-- For debugging only, really -->
+    <?=$SEP?><?= Button("DebugInfo", _("DebugInfo")) ?> <!-- For debugging only, really -->
 <?php } ?>
 <br />
diff --git a/themes/Portland/templates/navbar.tmpl b/themes/Portland/templates/navbar.tmpl
index 7698e14f9..80a0e1489 100644
--- a/themes/Portland/templates/navbar.tmpl
+++ b/themes/Portland/templates/navbar.tmpl
@@ -1,17 +1,14 @@
 <?php // -*-html-*- ?>
-<!-- $Id: navbar.tmpl,v 1.10 2004-06-14 11:26:50 rurban Exp $ -->
-<?php
-  $Sep = $WikiTheme->getButtonSeparator();
-?>
+<!-- $Id: navbar.tmpl,v 1.11 2007-01-02 13:29:40 rurban Exp $ -->
 <!-- The bottom navigation/search bar -->
 
     <?= WikiLink(_("FindPage"), "button") ?> by searching
-    <?php if (!empty($revision)) { ?>
+    <?php if ($revision) { ?>
       (or browse <?= Button("LikePages", _("LikePages")) ?>)
     <?php } ?>
     <?php if ($user->isAdmin()) { ?>
-     <?=$Sep?><?= Button($page->get('locked') ? 'unlock' : 'lock')?>
-     <?=$Sep?><?= Button('remove') ?>
+     <?=$SEP?><?= Button($page->get('locked') ? 'unlock' : 'lock')?>
+     <?=$SEP?><?= Button('remove') ?>
     <?php } ?>
    <hr />
 <!-- I would like not to have to use these tables, and managed to
@@ -26,8 +23,8 @@
 <tr valign="baseline">
   <td>
    <?= WikiLink(_("RecentChanges"), "button") ?>
-    <?php if (!empty($user) && $user->isAdmin()) { ?>
-     <?=$Sep?><?= WikiLink(_("PhpWikiAdministration"), "button") ?>
+    <?php if ($user->isAdmin()) { ?>
+     <?=$SEP?><?= WikiLink(_("PhpWikiAdministration"), "button") ?>
     <?php } ?>
   </td>
   <td align="right">
diff --git a/themes/shamino_com/templates/actionbar.tmpl b/themes/shamino_com/templates/actionbar.tmpl
index a06fd14ac..6f2519218 100644
--- a/themes/shamino_com/templates/actionbar.tmpl
+++ b/themes/shamino_com/templates/actionbar.tmpl
@@ -1,24 +1,24 @@
 <?php // -*-php-*-
-  $Sep = $WikiTheme->getButtonSeparator();
+if (empty($revision)) $revision = $page->getCurrentRevision(false);
 ?>
-<!-- $Id: actionbar.tmpl,v 1.1 2004-12-19 17:34:19 rurban Exp $ -->
+<!-- $Id: actionbar.tmpl,v 1.2 2007-01-02 13:29:40 rurban Exp $ -->
 <?= Button(array('action'=>'PageInfo'),_("PageInfo"),$page->getName()) ?>
-<?=$Sep?><?= Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) ?>
+<?=$SEP?><?= Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) ?>
 <?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?>
-  <?=$Sep?><?= Button($page->get('locked') ? 'unlock' : 'lock') ?>
+  <?=$SEP?><?= Button($page->get('locked') ? 'unlock' : 'lock') ?>
   <?php if (ENABLE_PAGEPERM) { ?>
-     <?=$Sep?><?= Button('chown') ?>
-     <?=$Sep?><?= Button('setacl') ?>
+     <?=$SEP?><?= Button('chown') ?>
+     <?=$SEP?><?= Button('setacl') ?>
   <?php } ?>
 <?php } ?>
 <?php if ($user->isAdmin() or mayAccessPage('remove',$page->getName())) { ?>
-   <?=$Sep?><?= Button('remove') ?>
+   <?=$SEP?><?= Button('remove') ?>
 <?php } ?>
 <?php if (!empty($user) && $user->isAdmin()) { ?>
-  <?=$Sep?><?= WikiLink(_("PhpWikiAdministration"), "","Admin") ?>
+  <?=$SEP?><?= WikiLink(_("PhpWikiAdministration"), "","Admin") ?>
   <!-- Buttons really only for debugging. See info for more -->
-  <?=$Sep?><?= Button(_("PageHistory")) ?>
-  <?=$Sep?><?= Button("diff") ?>
-  <?=$Sep?><?= Button(_("PageDump")) ?>
+  <?=$SEP?><?= Button(_("PageHistory")) ?>
+  <?=$SEP?><?= Button("diff") ?>
+  <?=$SEP?><?= Button(_("PageDump")) ?>
   <!-- End debugging buttons -->
 <?php } ?>
-- 
2.45.0