From 601ac4503276ffa0b749cda358d07c1f30c64c59 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Sun, 19 May 2024 01:12:34 +0200 Subject: [PATCH] PHPMailer: Remove check for non-existing get_magic_quotes() Summary: No idea if PHP ever offered such a method. In any case, this very check was removed in https://github.com/PHPMailer/PHPMailer/commit/6f919df65e80023fce4eab58832b6035b4a41935#diff-2d294eae28fb0d70fc32da8369c4fe33d301c99ca3eeb4bd41da18ad99344d68 in 2012. Test Plan: Not sure - how to test a removed check for a method which does not exist anyway? :) Reviewers: O1 Blessed Committers, avivey Reviewed By: O1 Blessed Committers, avivey Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Differential Revision: https://we.phorge.it/D25663 --- externals/phpmailer/class.phpmailer-lite.php | 5 ----- externals/phpmailer/class.phpmailer.php | 5 ----- 2 files changed, 10 deletions(-) diff --git a/externals/phpmailer/class.phpmailer-lite.php b/externals/phpmailer/class.phpmailer-lite.php index 335625ebad..06cf5cc9c3 100644 --- a/externals/phpmailer/class.phpmailer-lite.php +++ b/externals/phpmailer/class.phpmailer-lite.php @@ -1311,11 +1311,6 @@ class PHPMailerLite { if (!is_readable($path)) { throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE); } - if (function_exists('get_magic_quotes')) { - function get_magic_quotes() { - return false; - } - } if (PHP_VERSION < 6) { $magic_quotes = get_magic_quotes_runtime(); set_magic_quotes_runtime(0); diff --git a/externals/phpmailer/class.phpmailer.php b/externals/phpmailer/class.phpmailer.php index 69f9c45ba5..0a413a407b 100644 --- a/externals/phpmailer/class.phpmailer.php +++ b/externals/phpmailer/class.phpmailer.php @@ -1443,11 +1443,6 @@ class PHPMailer { if (!is_readable($path)) { throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE); } - if (function_exists('get_magic_quotes')) { - function get_magic_quotes() { - return false; - } - } if (PHP_VERSION < 6) { $magic_quotes = get_magic_quotes_runtime(); set_magic_quotes_runtime(0);