mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-55848-master' of git://github.com/lameze/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-11-15 16:33:26 +00:00
commit 6027eaebc5
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mod/assign/feedback/editpdf/fpdi/fpdi_bridge.php
View File

@ -16,17 +16,6 @@
* This way it is possible to use FPDI for both FPDF and TCPDF with one FPDI version.
*/
if (!class_exists('TCPDF', false)) {
/**
* Class fpdi_bridge
*/
class fpdi_bridge extends FPDF
{
// empty body
}
} else {
/**
* Class fpdi_bridge
*
@ -205,4 +194,3 @@ if (!class_exists('TCPDF', false)) {
return current(unpack('H*', $str));
}
}
}

7
mod/assign/feedback/editpdf/fpdi/readme_moodle.txt
View File

@ -19,6 +19,13 @@ Installation
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.
2016/11/15
----------
1) Class not exists check and the empty fpdi_bridge class has been removed from fpdi_bridge.php to fix a behat error.
Updated by Simey Lameze (MDL-55848)
2015/12/04
----------
Updated to FPDI: 1.6.1