1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 09:15:55 +00:00

compat patches for php7

This commit is contained in:
Andrew Dolgov
2015-12-04 09:29:58 +03:00
parent 9bd422c2e7
commit 1bd552ee31
3 changed files with 7 additions and 7 deletions

8
lib/phpmailer/class.phpmailer.php Normal file → Executable file
View File

@@ -1853,23 +1853,23 @@ class PHPMailer {
// return false;
// }
// }
$magic_quotes = get_magic_quotes_runtime();
/*$magic_quotes = get_magic_quotes_runtime();
if ($magic_quotes) {
if (version_compare(PHP_VERSION, '5.3.0', '<')) {
set_magic_quotes_runtime(0);
} else {
ini_set('magic_quotes_runtime', 0);
}
}
}*/
$file_buffer = file_get_contents($path);
$file_buffer = $this->EncodeString($file_buffer, $encoding);
if ($magic_quotes) {
/*if ($magic_quotes) {
if (version_compare(PHP_VERSION, '5.3.0', '<')) {
set_magic_quotes_runtime($magic_quotes);
} else {
ini_set('magic_quotes_runtime', $magic_quotes);
}
}
}*/
return $file_buffer;
} catch (Exception $e) {
$this->SetError($e->getMessage());