compat patches for php7

[tt-rss.git] / lib / phpmailer / class.phpmailer.php

diff --git a/lib/phpmailer/class.phpmailer.php b/lib/phpmailer/class.phpmailer.php
old mode 100644 (file)
new mode 100755 (executable)
index 99c0d78..9c286c9
--- 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());