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

diff --git a/CRM/Mailing/MailStore.php b/CRM/Mailing/MailStore.php
index f963a1b825..8d6f0061cd 100644
--- a/CRM/Mailing/MailStore.php
+++ b/CRM/Mailing/MailStore.php
@@ -28,7 +28,7 @@ class CRM_Mailing_MailStore {
    *   Name of the settings set from civimail_mail_settings to use (null for default).
    *
    * @throws Exception
-   * @return object
+   * @return CRM_Mailing_MailStore
    *   mail store implementation for processing CiviMail-bound emails
    */
   public static function getStore($name = NULL) {
@@ -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);