Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX : DA025905/FIX_TMPARRAY_ODTSUBSTITUION #566

Merged
merged 2 commits into from
Jan 31, 2025
Merged

FIX : DA025905/FIX_TMPARRAY_ODTSUBSTITUION #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abab743
Add the table in the merge of substitutions to add keys via the ODTS…
Jan 31, 2025
8f54b07
Add the table in the merge of substitutions to add keys via the ODTS…
Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ChangeLogSecuridis.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
** [FIX/DA025905/FIX_TMPARRAY_ODTSUBSTITUION] **
FIX : Add the $tmparray table in the merge of substitutions to add keys via the ODTSubstitution hook. **31/01/2025**
2 changes: 1 addition & 1 deletion htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ public function write_file($object, $outputlangs, $srctemplatepath)
$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
$array_other = $this->get_substitutionarray_other($outputlangs);

$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other);
$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $tmparray);
complete_substitutions_array($tmparray, $outputlangs, $object);

foreach ($tmparray as $key => $value) {
Expand Down
Loading