fix(bootstrap): fix and improve bootstrap loading.

flextype-plugins · Jan 3, 2021 · 1ddd2e3 · 1ddd2e3
1 parent 458ecae
commit 1ddd2e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/Controllers/SiteController.php b/app/Controllers/SiteController.php
@@ -75,6 +75,10 @@ public function index(Request $request, Response $response, array $args) : Respo
             return $response->withJson($entry);
         }
 
+
+        $themeBootstrapPath = PATH['project']. '/themes/' . flextype('registry')->get('plugins.site.settings.theme') . '/theme.php';
+        filesystem()->file($themeBootstrapPath)->exists() and include_once $themeBootstrapPath;
+
         // Set template path for current entry
         $path = 'themes/' . flextype('registry')->get('plugins.site.settings.theme') . '/' . (empty($entry['template']) ? 'templates/default' : 'templates/' . $entry['template']) . '.html';
 

diff --git a/dependencies.php b/dependencies.php
@@ -22,6 +22,3 @@
  * Init themes
  */
 flextype()->container()['themes']->init();
-
-$themeBootstrapPath = PATH['project']. '/themes/' . flextype('registry')->get('plugins.site.settings.theme') . '/theme.php';
-filesystem()->file($themeBootstrapPath)->exists() and include_once $themeBootstrapPath;