IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Various changes to make things work again.

Browse Source
This commit is contained in:
James Cole 2017-09-10 09:46:50 +02:00
parent 1faa520168
commit 24ea20f769
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/AttachmentController.php
View File

@ -99,7 +99,6 @@ class AttachmentController extends Controller
public function download(AttachmentRepositoryInterface $repository, Attachment $attachment)
{
if ($repository->exists($attachment)) {
$content = $repository->getContent($attachment);
$quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));

13
app/Providers/AppServiceProvider.php
View File

@ -15,6 +15,7 @@ namespace FireflyIII\Providers;
use Illuminate\Support\ServiceProvider;
use URL;
use Illuminate\Support\Facades\Schema;
/**
* Class AppServiceProvider
@ -30,17 +31,7 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot()
{
// force root URL.
$forcedUrl = env('APP_FORCE_ROOT', '');
if (strlen(strval($forcedUrl)) > 0) {
URL::forceRootUrl($forcedUrl);
}
// force https urls
if (env('APP_FORCE_SSL', false)) {
URL::forceScheme('https');
}
Schema::defaultStringLength(191);
}
/**

7
app/Support/ExpandedForm.php
View File

@ -17,6 +17,7 @@ use Amount as Amt;
use Carbon\Carbon;
use Eloquent;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\MessageBag;
use Input;
use RuntimeException;
@ -332,7 +333,7 @@ class ExpandedForm
$previousValue = null;
try {
$previousValue = Input::old('post_submit_action');
$previousValue = request()->old('post_submit_action');
} catch (RuntimeException $e) {
// don't care
}
@ -488,8 +489,8 @@ class ExpandedForm
$value = isset($preFilled[$name]) && is_null($value) ? $preFilled[$name] : $value;
}
try {
if (!is_null(Input::old($name))) {
$value = Input::old($name);
if (!is_null(request()->old($name))) {
$value = request()->old($name);
}
} catch (RuntimeException $e) {
// don't care about session errors.

2
config/database.php
View File

@ -6,7 +6,7 @@ return [
'connections' => [
'sqlite' => [
'driver' => 'sqlite',
'database' => env('DB_DATABASE', database_path('database.sqlite')),
'database' => env('DB_DATABASE', storage_path('database/database.sqlite')),
'prefix' => '',
],
'mysql' => [