lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #11227 from inietov/fixes/exception_getimagesize

Browse source 
Fixes #11116 Error exception in getimagesize
This commit is contained in:
snipe 2022-05-31 14:09:18 -07:00 • committed by GitHub
commit bb933e5214
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Controllers/Account/AcceptanceController.php
View file

@ -152,6 +152,13 @@ class AcceptanceController extends Controller
* since we want the moment-in-time proof of what the EULA was when they accepted it. * since we want the moment-in-time proof of what the EULA was when they accepted it.
*/ */
$branding_settings = SettingsController::getPDFBranding(); $branding_settings = SettingsController::getPDFBranding();
if (is_null($branding_settings->logo)){
$path_logo = "";
} else {
$path_logo = public_path() . '/uploads/' . $branding_settings->logo;
}
$data = [ $data = [
'item_tag' => $item->asset_tag, 'item_tag' => $item->asset_tag,
'item_model' => $display_model, 'item_model' => $display_model,
@ -162,7 +169,7 @@ class AcceptanceController extends Controller
'assigned_to' => $assigned_to, 'assigned_to' => $assigned_to,
'company_name' => $branding_settings->site_name, 'company_name' => $branding_settings->site_name,
'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null, 'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,
'logo' => public_path() . '/uploads/' . $branding_settings->logo, 'logo' => $path_logo,
'date_settings' => $branding_settings->date_display_format, 'date_settings' => $branding_settings->date_display_format,
]; ];