From ee60c40806fe576f420ac76b48c38d46bcc6919d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 21 Jul 2020 12:58:02 +0000
Subject: [PATCH] Mail: Make sure the `PHPMailer` class is only required once
 if a plugin requires `wp-includes/class-phpmailer.php` directly.

Follow-up to [48033].

Props david.binda.
Fixes #50716. See #41750.
Built from https://develop.svn.wordpress.org/trunk@48530


git-svn-id: http://core.svn.wordpress.org/trunk@48292 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-phpmailer.php | 4 ++--
 wp-includes/version.php         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/class-phpmailer.php b/wp-includes/class-phpmailer.php
index ff31db2f69..fe054f6879 100644
--- a/wp-includes/class-phpmailer.php
+++ b/wp-includes/class-phpmailer.php
@@ -12,8 +12,8 @@ if ( function_exists( '_deprecated_file' ) ) {
 	);
 }
 
-require __DIR__ . '/PHPMailer/PHPMailer.php';
-require __DIR__ . '/PHPMailer/Exception.php';
+require_once __DIR__ . '/PHPMailer/PHPMailer.php';
+require_once __DIR__ . '/PHPMailer/Exception.php';
 
 class_alias( PHPMailer\PHPMailer\PHPMailer::class, 'PHPMailer' );
 class_alias( PHPMailer\PHPMailer\Exception::class, 'phpmailerException' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 59489e79e8..f51577d9a3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-beta2-48529';
+$wp_version = '5.5-beta2-48530';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.