handle deprecated warning set_magic_quotes_runtime, do not set magic quotes all the time, only when get_magic_quotes_runtime returns true

This commit is contained in:
Klaus Leithoff 2010-11-25 15:02:21 +00:00
parent 8f3af965fc
commit 243f3e8cd1

View File

@ -1501,8 +1501,7 @@ class PHPMailer {
}
if (PHP_VERSION < 6)
{
$magic_quotes = get_magic_quotes_runtime();
set_magic_quotes_runtime(0);
if (function_exists('get_magic_quotes_runtime') && ($magic_quotes = get_magic_quotes_runtime())) set_magic_quotes_runtime(0);
}
try {
if ((@$file_buffer = file_get_contents($path))===false)
@ -1512,13 +1511,13 @@ class PHPMailer {
$file_buffer = $this->EncodeString($file_buffer, $encoding);
if (PHP_VERSION < 6)
{
set_magic_quotes_runtime($magic_quotes);
if ($magic_quotes) set_magic_quotes_runtime($magic_quotes);
}
return $file_buffer;
} catch (Exception $e) {
if (PHP_VERSION < 6)
{
set_magic_quotes_runtime($magic_quotes);
if ($magic_quotes) set_magic_quotes_runtime($magic_quotes);
}
$this->SetError($e->getMessage());
return '';