From 59d20e706aeaa07f7c1bcb2799f7ef080e4bdcb1 Mon Sep 17 00:00:00 2001 From: Adrian Greeve Date: Tue, 13 Oct 2015 09:10:18 +0800 Subject: [PATCH] MDL-49515 libraries: Update to editpdf/classes/pdf.php This updates fpdi_bridge to extend our Moodle pdf class as was done before. --- .../feedback/editpdf/fpdi/fpdi_bridge.php | 4 +++- .../feedback/editpdf/fpdi/readme_moodle.txt | 21 ++++++++++++++++++- .../feedback/editpdf/thirdpartylibs.xml | 2 +- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/mod/assign/feedback/editpdf/fpdi/fpdi_bridge.php b/mod/assign/feedback/editpdf/fpdi/fpdi_bridge.php index 58781dd5d7b..dc69d2e5d99 100644 --- a/mod/assign/feedback/editpdf/fpdi/fpdi_bridge.php +++ b/mod/assign/feedback/editpdf/fpdi/fpdi_bridge.php @@ -38,8 +38,10 @@ if (!class_exists('TCPDF', false)) { /** * Class fpdi_bridge + * + * This has been modified to use the Moodle pdflib wrapper which in turn extends TCPDF */ - class fpdi_bridge extends TCPDF + class fpdi_bridge extends pdf { /** * Array of Tpl-Data diff --git a/mod/assign/feedback/editpdf/fpdi/readme_moodle.txt b/mod/assign/feedback/editpdf/fpdi/readme_moodle.txt index 93a9deec361..bc1bae1be6a 100644 --- a/mod/assign/feedback/editpdf/fpdi/readme_moodle.txt +++ b/mod/assign/feedback/editpdf/fpdi/readme_moodle.txt @@ -12,6 +12,25 @@ Download from: http://www.setasign.de/products/pdf-php-solutions/fpdi/downloads Documentation: http://www.setasign.de/products/pdf-php-solutions/fpdi/manuals/ License: Apache Software License 2.0 -Downloaded versions: +Installation +------------ +1) Download the latest version of fpdi from the url above. +2) Unzip the files into this directory. +3) Update mod/assign/feedback/editpdf/fpdi/fpdi_bridge.php (or the replacement file) to extend 'pdf' instead of 'TCPDF'. +4) Make a note below of any changes made. + +2015/10/01 +---------- +Updated to FPDI: 1.5.4 + +fpdi no longer uses fpdi2tcpdf_bridge.php this has been replaced with fpdi_bridge.php. +fpdi_bridge.php has been modified to extend pdf (lib/pdflib.php) as was done with +fpdi2tcpdf_bridge.php. + +Updated by Adrian Greeve (MDL-49515) + +------------------ +Previous versions: + FPDI: 1.4.4 FPDF_TPL: 1.2.3 diff --git a/mod/assign/feedback/editpdf/thirdpartylibs.xml b/mod/assign/feedback/editpdf/thirdpartylibs.xml index fafb71c8925..5ce0dd6a5fb 100644 --- a/mod/assign/feedback/editpdf/thirdpartylibs.xml +++ b/mod/assign/feedback/editpdf/thirdpartylibs.xml @@ -4,7 +4,7 @@ fpdi FPDI Apache - 1.4.4 + 1.5.4 2.0 -- 2.43.0