Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4964 from turbo124/v5-develop

Browse Source 
Fixes for casts
This commit is contained in:
David Bomba 2021-02-22 21:35:17 +11:00 committed by GitHub
commit 14c41634e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Utils/Traits/CompanySettingsSaver.php
View File

@ -169,6 +169,9 @@ trait CompanySettingsSaver
if (substr($key, -3) == '_id' || substr($key, -14) == 'number_counter') { if (substr($key, -3) == '_id' || substr($key, -14) == 'number_counter') {
$value = 'integer'; $value = 'integer';
if($key == 'gmail_sending_user_id')
$value = 'string';
if (! property_exists($settings, $key)) { if (! property_exists($settings, $key)) {
continue; continue;
} elseif ($this->checkAttribute($value, $settings->{$key})) { } elseif ($this->checkAttribute($value, $settings->{$key})) {

4
app/Utils/Traits/SettingsSaver.php
View File

@ -48,6 +48,10 @@ trait SettingsSaver
/*Separate loop if it is a _id field which is an integer cast as a string*/ /*Separate loop if it is a _id field which is an integer cast as a string*/
elseif (substr($key, -3) == '_id' || substr($key, -14) == 'number_counter') { elseif (substr($key, -3) == '_id' || substr($key, -14) == 'number_counter') {
$value = 'integer'; $value = 'integer';
if($key == 'gmail_sending_user_id')
$value = 'string';
if (! property_exists($settings, $key)) { if (! property_exists($settings, $key)) {
continue; continue;
} elseif (! $this->checkAttribute($value, $settings->{$key})) { } elseif (! $this->checkAttribute($value, $settings->{$key})) {