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

Merge pull request #9868 from atm-ph/fix_develop_php_warnings_in_js

Browse Source 
Fix PHP warnings printed in javascript
This commit is contained in:
Laurent Destailleur 2018-10-26 15:19:21 +02:00 committed by GitHub
commit e875aee2c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/functions.lib.php
View File

@ -7094,6 +7094,8 @@ function printCommonFooter($zone='private')
$relativepathstring = preg_replace('/^\//', '', $relativepathstring); $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring); $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING'])); $tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
if (!empty($user->default_values[$relativepathstring]['focus']))
{
foreach($user->default_values[$relativepathstring]['focus'] as $defkey => $defval) foreach($user->default_values[$relativepathstring]['focus'] as $defkey => $defval)
{ {
$qualified = 0; $qualified = 0;
@ -7119,6 +7121,9 @@ function printCommonFooter($zone='private')
} }
} }
} }
}
if (!empty($user->default_values[$relativepathstring]['mandatory']))
{
foreach($user->default_values[$relativepathstring]['mandatory'] as $defkey => $defval) foreach($user->default_values[$relativepathstring]['mandatory'] as $defkey => $defval)
{ {
$qualified = 0; $qualified = 0;
@ -7146,6 +7151,7 @@ function printCommonFooter($zone='private')
} }
} }
} }
}
// Google Analytics // Google Analytics
// TODO Add a hook here // TODO Add a hook here