X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FMailing%2FMailStore.php;h=8d6f0061cd37f3373d35119d88907ab60b6044c8;hb=2d8aa03ea5aea744056f893ecb460eff4dd98b8f;hp=afc7d312edca1dcb561cc174f1f30af3488ae787;hpb=054faaff61e5f350bb66af4fd17d98680ec2fb40;p=civicrm-core.git

diff --git a/CRM/Mailing/MailStore.php b/CRM/Mailing/MailStore.php
index afc7d312ed..8d6f0061cd 100644
--- a/CRM/Mailing/MailStore.php
+++ b/CRM/Mailing/MailStore.php
@@ -69,12 +69,8 @@ class CRM_Mailing_MailStore {
   private static function getProtocolDefaults($protocol) {
     switch ($protocol) {
       case 'IMAP':
-      case 'IMAP_XOAUTH2':
         return [
-          // For backward compat with pre-release XOAuth2 configurations
-          'auth' => $protocol === 'IMAP_XOAUTH2' ? 'XOAuth2' : 'Password',
-          // In a simpler world:
-          // 'auth' => 'Password',
+          'auth' => 'Password',
           'factory' => function($mailSettings) {
             $useXOAuth2 = ($mailSettings['auth'] === 'XOAuth2');
             return new CRM_Mailing_MailStore_Imap($mailSettings['server'], $mailSettings['username'], $mailSettings['password'], (bool) $mailSettings['is_ssl'], $mailSettings['source'], $useXOAuth2);