From dc5db0c1379903054e1ebc8462568005acbb2fea Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Tue, 18 Jun 2013 09:07:53 +0200 Subject: [PATCH] fix ODT to PDF script path --- htdocs/includes/odtphp/odf.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php index d4467d7aeb8..94c69705442 100644 --- a/htdocs/includes/odtphp/odf.php +++ b/htdocs/includes/odtphp/odf.php @@ -458,7 +458,12 @@ IMG; $execmethod=(empty($conf->global->MAIN_EXEC_USE_POPEN)?1:2); // 1 or 2 $name=str_replace('.odt', '', $name); - $command = '../../scripts/odt2pdf/odt2pdf.sh '.$name; + if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT)) { + $command = $conf->global->MAIN_DOL_SCRIPTS_ROOT.'/scripts/odt2pdf/odt2pdf.sh '.$name; + }else { + $command = '../../scripts/odt2pdf/odt2pdf.sh '.$name; + } + //$dirname=dirname($name); //$command = DOL_DOCUMENT_ROOT.'/includes/odtphp/odt2pdf.sh '.$name.' '.$dirname;