kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 08:11:20 +00:00
Code Issues Projects Releases Wiki Activity

Fix back and forth between v1 and v2

Browse Source
This commit is contained in:
James Cole
2025-05-04 21:24:50 +02:00
parent 4b92ab46a3
commit a4f7c90e09
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Console/Commands/Upgrade/UpgradesDatabase.php
View File

@@ -23,8 +23,14 @@
declare(strict_types=1);
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 Illuminate\Console\Command;

3
app/Http/Controllers/Controller.php
View File

@@ -32,6 +32,7 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\View;
use Route;
@@ -80,6 +81,8 @@ abstract class Controller extends BaseController
// overrule v2 layout back to v1.
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
}