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()