lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21328 from defrance/patch-211

Browse Source 
expedition setting php V8 warning
This commit is contained in:
Laurent Destailleur 2022-06-23 11:41:17 +02:00 committed by GitHub
commit d87f8d874b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/expedition.php
View File

@ -231,7 +231,7 @@ foreach ($dirmodels as $reldir) {
if ($conf->global->EXPEDITION_ADDON_NUMBER == "$file") { if ($conf->global->EXPEDITION_ADDON_NUMBER == "$file") {
print img_picto($langs->trans("Activated"), 'switch_on'); print img_picto($langs->trans("Activated"), 'switch_on');
} else { } else {
print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&token='.newToken().'&value='.urlencode($file).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'; print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&token='.newToken().'&value='.urlencode($file).'&label='.urlencode($module->name).'">';
print img_picto($langs->trans("Disabled"), 'switch_off'); print img_picto($langs->trans("Disabled"), 'switch_off');
print '</a>'; print '</a>';
} }

2
htdocs/core/modules/expedition/mod_expedition_ribera.php
View File

@ -127,7 +127,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
$mask = getDolGlobalString('EXPEDITION_RIBERA_MASK'); $mask = getDolGlobalString('EXPEDITION_RIBERA_MASK');
if (!$mask) { if (empty($mask)) {
$this->error = 'NotConfigured'; $this->error = 'NotConfigured';
return 0; return 0;
} }