FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore theme db lookup

Browse Source
This commit is contained in:
Nabeel Shahzad
2020-03-04 08:54:55 -05:00
parent 89481b5fa1
commit b1e745844a
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Middleware/SetActiveTheme.php
+2 -9
View File
@@ -15,23 +15,16 @@ class SetActiveTheme implements Middleware
{ {
public function handle(Request $request, Closure $next) public function handle(Request $request, Closure $next)
{ {
if (!$request->session()->has('theme')) {
try { try {
$theme = setting('general.theme'); $theme = setting('general.theme');
if (empty($theme)) {
$theme = 'default';
}
} catch (\Exception $e) { } catch (\Exception $e) {
Log::error($e->getMessage()); Log::error($e->getMessage());
$theme = 'default'; $theme = 'default';
} }
$request->session()->put('theme', $theme); if (!empty($theme)) {
} else {
$theme = $request->session()->get('theme', 'default');
}
Theme::set($theme); Theme::set($theme);
}
return $next($request); return $next($request);
} }