Merge pull request #13855 from eileenmcnaughton/activity_date_picker

[civicrm-core.git] / Civi / Core / Container.php

diff --git a/Civi/Core/Container.php b/Civi/Core/Container.php
index d75a9a13dd95c6eaee2067e650f802da6e9cde11..92290febc70db9e441eafdf3c77a169ccb7b0aad 100644 (file)
--- a/Civi/Core/Container.php
+++ b/Civi/Core/Container.php
@@ -443,9 +443,11 @@ class Container {
   public static function createPrevNextCache($container) {
     $setting = \Civi::settings()->get('prevNextBackend');
     if ($setting === 'default') {
+      // For initial release (5.8.x), continue defaulting to SQL.
+      $isTransitional = version_compare(\CRM_Utils_System::version(), '5.9.alpha1', '<');
       $cacheDriver = \CRM_Utils_Cache::getCacheDriver();
       $service = 'prevnext.driver.' . strtolower($cacheDriver);
-      return $container->has($service)
+      return $container->has($service) && !$isTransitional
         ? $container->get($service)
         : $container->get('prevnext.driver.sql');
     }