From 1891fc02a16324f0471eed487feae8319cbed22b Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Mon, 9 Aug 2010 14:00:30 +0000
Subject: [PATCH] Consistent naming for templates: TemplateTalk -->
 Template/Talk

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@7633 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/loadsave.php                         | 6 +++---
 pgsrc/{TemplateTalk => Template%2FTalk}  | 4 ++--
 themes/MonoBook/templates/actionbar.tmpl | 2 +-
 themes/gforge/templates/actionbar.tmpl   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename pgsrc/{TemplateTalk => Template%2FTalk} (83%)

diff --git a/lib/loadsave.php b/lib/loadsave.php
index ac033a01a..6219f4643 100644
--- a/lib/loadsave.php
+++ b/lib/loadsave.php
@@ -1528,11 +1528,11 @@ function SetupWiki (&$request)
     $finder = new FileFinder;
 
     if (!GFORGE) {
-        $mandatory = explode(':','SandBox:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
+        $mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
     } else if (WIKI_NAME == "help") {
-        $mandatory = explode(':','SandBox:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
+        $mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
     } else {
-        $mandatory = explode(':','SandBox:Template/UserPage:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
+        $mandatory = explode(':','SandBox:Template/UserPage:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
     }
     foreach (array_merge($mandatory,
                          $GLOBALS['AllActionPages'],
diff --git a/pgsrc/TemplateTalk b/pgsrc/Template%2FTalk
similarity index 83%
rename from pgsrc/TemplateTalk
rename to pgsrc/Template%2FTalk
index 40bbadfea..d93b63525 100644
--- a/pgsrc/TemplateTalk
+++ b/pgsrc/Template%2FTalk
@@ -1,8 +1,8 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
+Date: Mon, 9 Apr 2010 15:32:58 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
-  pagename=TemplateTalk;
+  pagename=Template%2FTalk;
   flags=EXTERNAL_PAGE;
   markup=2;
   charset=UTF-8
diff --git a/themes/MonoBook/templates/actionbar.tmpl b/themes/MonoBook/templates/actionbar.tmpl
index 01e8e1655..c73c37fb4 100644
--- a/themes/MonoBook/templates/actionbar.tmpl
+++ b/themes/MonoBook/templates/actionbar.tmpl
@@ -22,7 +22,7 @@
 	  <?php echo ActionButton(array('action'=>'browse'), _("Discussion"), $talk->getName()) ?>
         <?php } else { ?>
 	  <?php echo ActionButton(array('action'=>'create',
-				 'template'=>_("TemplateTalk")),
+				 'template'=>_("Template/Talk")),
 			   _("Discussion"), $talk->getName()) ?>
         <?php } ?>
       <?php } ?>
diff --git a/themes/gforge/templates/actionbar.tmpl b/themes/gforge/templates/actionbar.tmpl
index 720885953..f2b746379 100644
--- a/themes/gforge/templates/actionbar.tmpl
+++ b/themes/gforge/templates/actionbar.tmpl
@@ -31,7 +31,7 @@ $isBrowse = $request->getArg('action') == 'browse';
         <?php } else { ?>
           <td>
           <?php echo Button(array('action'=>'create',
-                                 'template'=>_("TemplateTalk")),
+                                 'template'=>_("Template/Talk")),
                            _("Discussion"), $talk->getName()) ?>
           </td>
         <?php } ?>
-- 
2.45.0