From 18aecbaa9e38331028ed33d62fee8fa4e9f07ec6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Mar 2012 01:42:18 +0100
Subject: [PATCH] Add test to work with old FPDF.
---
htdocs/core/lib/pdf.lib.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 94bb4d1e6bf..941028ccb61 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -77,7 +77,11 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
{
global $conf;
- require_once(TCPDF_PATH.'tcpdf.php');
+ if (! empty($conf->global->MAIN_USE_FPDF) && ! empty($conf->global->MAIN_DISABLE_FPDI))
+ return "Error MAIN_USE_PDF and MAIN_DISABLE_FPDI can't be set together";
+
+ // We use by default TCPDF
+ if (empty($conf->global->MAIN_USE_FPDF)) require_once(TCPDF_PATH.'tcpdf.php');
// We need to instantiate fpdi object (instead of tcpdf) to use merging features. But we can disable it.
if (empty($conf->global->MAIN_DISABLE_FPDI)) require_once(FPDI_PATH.'fpdi.php');
--
GitLab