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

Merge pull request #7346 from hregis/6.0_bug3

Browse Source 
Fix: avoid warning
This commit is contained in:
Laurent Destailleur 2017-09-11 14:07:38 +02:00 committed by GitHub
commit 19e780c53f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
View File

@ -420,10 +420,11 @@ class doc_generic_user_odt extends ModelePDFUser
return -1; return -1;
} }
function get_substitutionarray_object($object,$outputlangs) { function get_substitutionarray_object($object,$outputlangs,$array_key='object') {
$array_other=array();
foreach($object as $key => $value) { foreach($object as $key => $value) {
if (!is_array($value) && !is_object($value)) { if (!is_array($value) && !is_object($value)) {
$array_other['object_'.$key] = $value; $array_other[$array_key.'_'.$key] = $value;
} }
} }
return $array_other; return $array_other;