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

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

Revision: 9554
          http://sourceforge.net/p/phpwiki/code/9554
Author:   vargenau
Date:     2015-02-20 16:10:50 +0000 (Fri, 20 Feb 2015)
Log Message:
-----------
Load theme pgsrc, if it exists

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

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2015-02-19 15:49:32 UTC (rev 9553)
+++ trunk/lib/loadsave.php	2015-02-20 16:10:50 UTC (rev 9554)
@@ -1479,9 +1479,6 @@
  * HomePage was not found so first-time install is supposed to run.
  * - import all pgsrc pages.
  * - Todo: installer interface to edit config/config.ini settings
- * - Todo: ask for existing old index.php to convert to config/config.ini
- * - Todo: theme-specific pages:
- *   blog - HomePage, ADMIN_USER/Blogs
  */
 function SetupWiki(&$request)
 {
@@ -1501,13 +1498,19 @@
 
     $pgsrc = FindLocalizedFile(WIKI_PGSRC);
     $default_pgsrc = FindFile(DEFAULT_WIKI_PGSRC);
+    $theme_pgsrc = FindFile("themes/".THEME."/".WIKI_PGSRC, true);
 
     $request->setArg('overwrite', true);
+    // Load theme pgsrc, if it exists
+    if ($theme_pgsrc) {
+        LoadAny($request, $theme_pgsrc);
+    }
     if ($default_pgsrc != $pgsrc) {
         LoadAny($request, $default_pgsrc, $GenericPages);
     }
     $request->setArg('overwrite', false);
     LoadAny($request, $pgsrc);
+
     $dbi =& $request->_dbi;
 
     // Ensure that all mandatory pages are loaded

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