Fixing code that blocks sending emails with attachment.

main/inc/lib/phpmailer/class.phpmailer.php

@@ -1460,19 +1460,24 @@ 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);
-      }
-      $file_buffer  = file_get_contents($path);
-      $file_buffer  = $this->EncodeString($file_buffer, $encoding);
-      if (PHP_VERSION < 6) { set_magic_quotes_runtime($magic_quotes); }
-      return $file_buffer;
+        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 (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());
       return '';
@@ -2328,4 +2333,4 @@ class phpmailerException extends Exception {
     return $errorMsg;
   }
 }
-?>
+?>