From d1cc7dcdf9edaf1e4a2b6433db22c3695b0b75ec Mon Sep 17 00:00:00 2001
From: Dane Powell <git@danepowell.com>
Date: Wed, 13 Jun 2018 12:11:25 -0700
Subject: [PATCH] Issue #2871721 by Dane Powell, janusman, vaibhavjain: Fixed
 Acquia Search not connecting to production search cores.

---
 acquia_search/src/PreferredSearchCoreService.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/acquia_search/src/PreferredSearchCoreService.php b/acquia_search/src/PreferredSearchCoreService.php
index 98847d1..9cdc61d 100644
--- a/acquia_search/src/PreferredSearchCoreService.php
+++ b/acquia_search/src/PreferredSearchCoreService.php
@@ -178,6 +178,7 @@ class PreferredSearchCoreService {
    *   E.g.
    *     [
    *       'WXYZ-12345',
+   *       'WXYZ-12345.dev.default',
    *       'WXYZ-12345.dev.mysitedev_folder1',
    *       'WXYZ-12345.dev.mysitedev_db',
    *     ]
@@ -201,13 +202,16 @@ class PreferredSearchCoreService {
 
       $possible_core_ids[] = $this->acquia_identifier . '.' . $ah_env . '.' . $sites_foldername;
 
+      $possible_core_ids[] = $this->acquia_identifier . '.' . $ah_env . '.default';
+
       // @TODO: Support for [id]_[env][sitename] cores?
 
     }
 
     // For production-only, we allow auto-connecting to the suffix-less core
     // as the fallback.
-    if (!empty($_SERVER['AH_PRODUCTION']) || !empty($_ENV['AH_PRODUCTION'])) {
+    $is_acsf_prod = !empty($_SERVER['AH_REALM']) && ($_SERVER['AH_REALM'] == 'enterprise-g1');
+    if (!empty($_SERVER['AH_PRODUCTION']) || !empty($_ENV['AH_PRODUCTION']) || $is_acsf_prod) {
       $possible_core_ids[] = $this->acquia_identifier;
     }
 
-- 
2.17.1