Skip to content
Snippets Groups Projects
Commit 9eff436f authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge pull request #3136 from alainabbas/develop 

Correct bug #3050
parents 55dbc2df 86581405
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/includes/odtphp/odf.php
+ 2
− 2
View file @ 9eff436f
...@@ -489,11 +489,11 @@ IMG; ...@@ -489,11 +489,11 @@ IMG;
$name=preg_replace('/\.odt/i', '', $name); $name=preg_replace('/\.odt/i', '', $name);
if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT)) if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT))
{ {
$command = $conf->global->MAIN_DOL_SCRIPTS_ROOT.'/scripts/odt2pdf/odt2pdf.sh '.$name.' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF); $command = $conf->global->MAIN_DOL_SCRIPTS_ROOT.'/scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($name).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
} }
else else
{ {
$command = '../../scripts/odt2pdf/odt2pdf.sh '.$name.' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF); $command = '../../scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($name).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment