From 34f8a0758b180c277aefbc20e7c1bbe731c3c031 Mon Sep 17 00:00:00 2001 From: "cristovao.oliveira" Date: Wed, 17 Jun 2020 17:06:18 +0100 Subject: [PATCH 1/3] - fix Function get_magic_quotes_runtime() deprecated for PHP 7.4 --- .idea/.gitignore | 2 ++ .idea/PDFMerger.iml | 12 ++++++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ Classes/fpdf/fpdf.php | 6 ++++-- 6 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/PDFMerger.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..e7e9d11 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml diff --git a/.idea/PDFMerger.iml b/.idea/PDFMerger.iml new file mode 100644 index 0000000..374b5ff --- /dev/null +++ b/.idea/PDFMerger.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..28a804d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..01e9730 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Classes/fpdf/fpdf.php b/Classes/fpdf/fpdf.php index e7fbb45..badbde3 100755 --- a/Classes/fpdf/fpdf.php +++ b/Classes/fpdf/fpdf.php @@ -1040,8 +1040,10 @@ protected function _dochecks() if(ini_get('mbstring.func_overload') & 2) $this->Error('mbstring overloading must be disabled'); // Ensure runtime magic quotes are disabled - if(get_magic_quotes_runtime()) - @set_magic_quotes_runtime(0); + if (version_compare(PHP_VERSION, '5.3.0', '<')) { + if(get_magic_quotes_runtime()) + @set_magic_quotes_runtime(0); + } } protected function _checkoutput() From 2ab075c58c215965f6d75d50eaeb322a9f1d009d Mon Sep 17 00:00:00 2001 From: "cristovao.oliveira" Date: Wed, 17 Jun 2020 17:32:03 +0100 Subject: [PATCH 2/3] - changed project name and version --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index f852be7..83bf2d7 100755 --- a/composer.json +++ b/composer.json @@ -1,9 +1,9 @@ { - "name": "rguedes/pdfmerger", - "version": "1.0.4", + "name": "crisleiria/pdfmerger", + "version": "1.0.6", "description": "PDFMerger for PHP", "keywords": ["PHP", "PDF"], - "homepage": "https://github.com/rguedes/PDFMerger", + "homepage": "https://github.com/crisleiria/PDFMerger", "type": "library", "license": "LGPL-3.0-or-later", "authors": [{ From 007ce92427b99b52b66040d06543a4c20f6f6d67 Mon Sep 17 00:00:00 2001 From: "cristovao.oliveira" Date: Wed, 17 Jun 2020 18:04:02 +0100 Subject: [PATCH 3/3] - reverse project name and version --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 83bf2d7..f852be7 100755 --- a/composer.json +++ b/composer.json @@ -1,9 +1,9 @@ { - "name": "crisleiria/pdfmerger", - "version": "1.0.6", + "name": "rguedes/pdfmerger", + "version": "1.0.4", "description": "PDFMerger for PHP", "keywords": ["PHP", "PDF"], - "homepage": "https://github.com/crisleiria/PDFMerger", + "homepage": "https://github.com/rguedes/PDFMerger", "type": "library", "license": "LGPL-3.0-or-later", "authors": [{