kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues 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
4 changed files with 7 additions and 16 deletions
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) public function download(AttachmentRepositoryInterface $repository, Attachment $attachment)
{ {
if ($repository->exists($attachment)) { if ($repository->exists($attachment)) {
$content = $repository->getContent($attachment); $content = $repository->getContent($attachment);
$quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\')); $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 Illuminate\Support\ServiceProvider;
use URL; use URL;
use Illuminate\Support\Facades\Schema;
/** /**
* Class AppServiceProvider * Class AppServiceProvider
@@ -30,17 +31,7 @@ class AppServiceProvider extends ServiceProvider
*/ */
public function boot() public function boot()
{ {
Schema::defaultStringLength(191);
// 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');
}
} }
/** /**

7
app/Support/ExpandedForm.php
View File

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

2
config/database.php
View File

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