From a203824fdf084cf96b8e9b685cf03b8cf5a7f0eb Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Tue, 4 Jan 2011 14:21:32 +0000
Subject: [PATCH] Use SUBPAGE_SEPARATOR

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@7804 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 themes/MonoBook/templates/actionbar.tmpl    | 2 +-
 themes/default/templates/navbar.tmpl        | 2 +-
 themes/fusionforge/templates/actionbar.tmpl | 2 +-
 themes/wikilens/templates/navbar.tmpl       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/MonoBook/templates/actionbar.tmpl b/themes/MonoBook/templates/actionbar.tmpl
index c73c37fb4..7dacc6fd3 100644
--- a/themes/MonoBook/templates/actionbar.tmpl
+++ b/themes/MonoBook/templates/actionbar.tmpl
@@ -12,7 +12,7 @@
 <div class="portlet" id="p-cactions">
   <h5><?php echo _("Views") ?></h5>
   <ul>
-    <?php if (!string_ends_with($pagename, _("/Discussion"))) { ?>
+    <?php if (!string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion"))) { ?>
       <?php $talk = new WikiPageName('Talk:'.$pagename); ?>
       <?php echo ActionButton(array(),
 		       $isActionPage ? _("ActionPage") : _("Article"), 
diff --git a/themes/default/templates/navbar.tmpl b/themes/default/templates/navbar.tmpl
index a9962f2eb..f0818fba7 100644
--- a/themes/default/templates/navbar.tmpl
+++ b/themes/default/templates/navbar.tmpl
@@ -5,7 +5,7 @@
 <div id="navbuttons">
 <?php if (ENABLE_DISCUSSION_LINK) { ?>
 <?php // This requires Talk: map to end in "/Discussion"
-  if (!string_ends_with($page->getName(), _("Discussion"))) { ?>
+  if (!string_ends_with($page->getName(), SUBPAGE_SEPARATOR._("Discussion"))) { ?>
     <?php echo $SEP?><?php echo WikiLink(new WikiPagename('Talk:'.$page->getName(), $page->getName()), 
                'button', _("Discussion")) ?>
   <?php } else { ?>
diff --git a/themes/fusionforge/templates/actionbar.tmpl b/themes/fusionforge/templates/actionbar.tmpl
index 38ca4e5ec..6c8fc125d 100644
--- a/themes/fusionforge/templates/actionbar.tmpl
+++ b/themes/fusionforge/templates/actionbar.tmpl
@@ -13,7 +13,7 @@ $isBrowse = $request->getArg('action') == 'browse';
     <table cellpadding="0" cellspacing="0">
     <tr>
 
-    <?php if (!string_ends_with($pagename, _("/Discussion"))) { ?>
+    <?php if (!string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion"))) { ?>
     <?php $talk = new WikiPageName('Talk:'.$pagename); ?>
       <td class="bold">
       <?php echo Button(array(),
diff --git a/themes/wikilens/templates/navbar.tmpl b/themes/wikilens/templates/navbar.tmpl
index 62fec81cf..1e5bfcbb8 100644
--- a/themes/wikilens/templates/navbar.tmpl
+++ b/themes/wikilens/templates/navbar.tmpl
@@ -6,7 +6,7 @@
 <div id="navbuttons">
 <?php if (ENABLE_DISCUSSION_LINK) { ?>
 <?php // This requires Talk: map to end in "/Discussion"
-  if (!string_ends_with($page->getName(), _("Discussion"))) { ?>
+  if (!string_ends_with($page->getName(), SUBPAGE_SEPARATOR._("Discussion"))) { ?>
     <?php echo $NSEP?><?php echo WikiLink(new WikiPagename('Talk:'.$page->getName(), $page->getName()), 
                'button', _("Discussion")) ?>
   <?php } else { ?>
-- 
2.45.0