From 1bd552ee319a8f8f69c45f03d2ed38424c51e114 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 4 Dec 2015 09:29:58 +0300
Subject: compat patches for php7

---
 lib/phpmailer/class.phpmailer.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 lib/phpmailer/class.phpmailer.php

(limited to 'lib/phpmailer')

diff --git a/lib/phpmailer/class.phpmailer.php b/lib/phpmailer/class.phpmailer.php
old mode 100644
new mode 100755
index 99c0d783a..9c286c9a1
--- a/lib/phpmailer/class.phpmailer.php
+++ b/lib/phpmailer/class.phpmailer.php
@@ -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());
-- 
cgit v1.2.3