Skip to content
Snippets Groups Projects
Commit 19e780c5 authored by Laurent Destailleur's avatar Laurent Destailleur Committed by GitHub
Browse files

Merge pull request #7346 from hregis/6.0_bug3

Fix: avoid warning
parents 646e8713 67e9b65a
Branches
Tags
No related merge requests found
...@@ -420,10 +420,11 @@ class doc_generic_user_odt extends ModelePDFUser ...@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment