Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Return early when deleting non existent filename

Browse Source
This commit is contained in:
David Bomba 2022-08-04 09:29:30 +10:00
parent cbcf0dc238
commit 68fe664ad6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Middleware/SetDomainNameDb.php
View File

@ -50,7 +50,6 @@ class SetDomainNameDb
]; ];
if ($company = MultiDB::findAndSetDbByDomain($query)) { if ($company = MultiDB::findAndSetDbByDomain($query)) {
//$request->merge(['company_key' => $company->company_key]);
session()->put('company_key', $company->company_key); session()->put('company_key', $company->company_key);
} else { } else {
if ($request->json) { if ($request->json) {
@ -68,7 +67,6 @@ class SetDomainNameDb
]; ];
if ($company = MultiDB::findAndSetDbByDomain($query)) { if ($company = MultiDB::findAndSetDbByDomain($query)) {
//$request->merge(['company_key' => $company->company_key]);
session()->put('company_key', $company->company_key); session()->put('company_key', $company->company_key);
} else { } else {
if ($request->json) { if ($request->json) {

3
app/Models/Backup.php
View File

@ -51,6 +51,9 @@ class Backup extends BaseModel
{ {
nlog('deleting => '.$this->filename); nlog('deleting => '.$this->filename);
if(!$this->filename)
return;
try { try {
Storage::disk(config('filesystems.default'))->delete($this->filename); Storage::disk(config('filesystems.default'))->delete($this->filename);
} catch (\Exception $e) { } catch (\Exception $e) {