Merge pull request #2050 from LuckyCyborg/4.0

[4.0] Improve the App\Controllers\BaseController
nova-framework · Mar 23, 2018 · f77cb49 · f77cb49
2 parents abb659f + 17d37b1
commit f77cb49
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
@@ -68,7 +68,12 @@ protected function initialize()
             $this->theme = Config::get('app.theme', 'Themes/Bootstrap');
         }
 
-        if (! Str::contains($theme = $this->theme, '/')) {
+        if ($this->theme === false) {
+            return;
+        }
+
+        // A Theme is configured for this Controller.
+        else if (! Str::contains($theme = $this->theme, '/')) {
             $theme = 'Themes/' .$theme;
         }
 

diff --git a/app/Platform/Bootstrap.php b/app/Platform/Bootstrap.php
@@ -14,7 +14,7 @@
 // Define The Application Version
 //--------------------------------------------------------------------------
 
-define('VERSION', '4.0.39');
+define('VERSION', '4.0.40');
 
 //--------------------------------------------------------------------------
 // Set PHP Error Reporting Options