From ec66b4c1b91ea3e5b8945ed723301253285bbd06 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 9 Dec 2016 16:02:29 +0100
Subject: php-PHPMailer: 5.2.17

---
 PHPMailer-path.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'PHPMailer-path.patch')

diff --git a/PHPMailer-path.patch b/PHPMailer-path.patch
index 4aac9e7..59a0ca5 100644
--- a/PHPMailer-path.patch
+++ b/PHPMailer-path.patch
@@ -1,7 +1,7 @@
 diff -up ./class.phpmailer.php.rpm ./class.phpmailer.php
---- ./class.phpmailer.php.rpm	2014-09-25 18:36:22.000000000 +0200
-+++ ./class.phpmailer.php	2014-09-26 12:58:08.790951530 +0200
-@@ -1191,6 +1191,7 @@ class PHPMailer
+--- ./class.phpmailer.php.rpm	2016-12-09 11:03:48.000000000 +0100
++++ ./class.phpmailer.php	2016-12-09 15:03:58.489947280 +0100
+@@ -1475,6 +1475,7 @@ class PHPMailer
      public function getSMTPInstance()
      {
          if (!is_object($this->smtp)) {
@@ -9,12 +9,12 @@ diff -up ./class.phpmailer.php.rpm ./class.phpmailer.php
              $this->smtp = new SMTP;
          }
          return $this->smtp;
-@@ -1415,7 +1416,7 @@ class PHPMailer
+@@ -1730,7 +1731,7 @@ class PHPMailer
          );
          if (empty($lang_path)) {
              // Calculate an absolute path so it can work if CWD is not here
 -            $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
 +            $lang_path = '/usr/share/PHPMailer/language/';
          }
-         $foundlang = true;
-         $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
+         //Validate $langcode
+         if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
-- 
cgit