[phpwiki-checkins] SF.net SVN: phpwiki:[8825] trunk/lib/loadsave.php

[<var...@us...>]

Revision: 8825
          http://sourceforge.net/p/phpwiki/code/8825
Author:   vargenau
Date:     2013-07-04 14:45:29 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Better handling of mandatory pages

Modified Paths:
--------------
    trunk/lib/loadsave.php

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2013-07-04 14:43:33 UTC (rev 8824)
+++ trunk/lib/loadsave.php	2013-07-04 14:45:29 UTC (rev 8825)
@@ -1508,16 +1508,23 @@
     // 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)) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.