mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-17 01:42:19 +00:00
Fix back and forth between v1 and v2
This commit is contained in:
@@ -23,8 +23,14 @@
|
|||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace FireflyIII\Console\Commands\Upgrade;
|
namespace FireflyIII\Console\Commands\Upgrade;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
|
use Safe\Exceptions\InfoException;
|
||||||
|
|
||||||
\Safe\set_time_limit(0);
|
try {
|
||||||
|
set_time_limit(0);
|
||||||
|
} catch (InfoException) {
|
||||||
|
Log::warning('set_time_limit returned false. This could be an issue, unless you also run XDebug.');
|
||||||
|
}
|
||||||
|
|
||||||
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
|
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
|
@@ -32,6 +32,7 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
|
|||||||
use Illuminate\Foundation\Bus\DispatchesJobs;
|
use Illuminate\Foundation\Bus\DispatchesJobs;
|
||||||
use Illuminate\Foundation\Validation\ValidatesRequests;
|
use Illuminate\Foundation\Validation\ValidatesRequests;
|
||||||
use Illuminate\Routing\Controller as BaseController;
|
use Illuminate\Routing\Controller as BaseController;
|
||||||
|
use Illuminate\Support\Facades\Config;
|
||||||
use Illuminate\Support\Facades\View;
|
use Illuminate\Support\Facades\View;
|
||||||
use Route;
|
use Route;
|
||||||
|
|
||||||
@@ -80,6 +81,8 @@ abstract class Controller extends BaseController
|
|||||||
|
|
||||||
// overrule v2 layout back to v1.
|
// overrule v2 layout back to v1.
|
||||||
if ('true' === request()->get('force_default_layout') && 'v2' === config('view.layout')) {
|
if ('true' === request()->get('force_default_layout') && 'v2' === config('view.layout')) {
|
||||||
|
//config('view.layout','v1');
|
||||||
|
Config::set('view.layout', 'v1');
|
||||||
View::getFinder()->setPaths([\Safe\realpath(base_path('resources/views'))]); // @phpstan-ignore-line
|
View::getFinder()->setPaths([\Safe\realpath(base_path('resources/views'))]); // @phpstan-ignore-line
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user