From c4d9ef24a986b8fd13f6bb1d8cc74fd80163814e Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 4 Jul 2013 14:45:29 +0000
Subject: [PATCH] Better handling of mandatory pages

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8825 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/loadsave.php | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/loadsave.php b/lib/loadsave.php
index 11a822878..477022e9f 100644
--- a/lib/loadsave.php
+++ b/lib/loadsave.php
@@ -1508,16 +1508,23 @@ function SetupWiki(&$request)
     // Ensure that all mandatory pages are loaded
     $finder = new FileFinder;
 
-    if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
-        $mandatory = explode(':', 'SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
-    } elseif (WIKI_NAME == "help") {
-        $mandatory = explode(':', 'SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
-    } else {
-        $mandatory = explode(':', 'SandBox:Template/UserPage:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
+    $mandatory = array('SandBox', 
+                       'Template/Category',
+                       'Template/Talk',
+                       'SpecialPages',
+                       'CategoryCategory',
+                       'CategoryActionPage',
+                       'Help/TextFormattingRules',
+                       'PhpWikiAdministration');
+
+    if ((defined('FUSIONFORGE') and FUSIONFORGE)) {
+        $mandatory[] = 'Template/UserPage';
     }
-    foreach (array_merge($mandatory,
-        $GLOBALS['AllActionPages'],
-        array(constant('HOME_PAGE'))) as $f) {
+
+    $mandatory = array_merge($mandatory, $GLOBALS['AllActionPages']);
+    $mandatory[] = constant('HOME_PAGE');
+
+    foreach ($mandatory as $f) {
         $page = gettext($f);
         $epage = urlencode($page);
         if (!$dbi->isWikiPage($page)) {
-- 
2.42.0