From 96f346f8aa3524884ceb72f6ffe04a332b6bea34 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 9 May 2017 17:45:43 +1200
Subject: [PATCH] CRM-20541 force connection to be populated when overcome by
 caching

---
 CRM/Core/DAO.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index 95081072bf..b53fbe4ed6 100644
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -346,6 +346,11 @@ class CRM_Core_DAO extends DB_DataObject {
     // rewrite queries that should use $dbLocale-based views for multi-language installs
     global $dbLocale, $_DB_DATAOBJECT;
 
+    if (empty($_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5])) {
+      // Will force connection to be populated per CRM-20541.
+      new CRM_Core_DAO();
+    }
+
     $conn = &$_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5];
     $orig_options = $conn->options;
     $this->_setDBOptions($this->_options);
-- 
2.25.1