Merge branch 'develop' into replication-connection

Author: tillkruss

CHANGELOG.md

@@ -2,8 +2,8 @@
 
 ## Unreleased
 
-- Fixed `wp_cache_flush_group` issue with Predis and replication connection
-- Fixed Redis version detection issue with Predis and replication connection
+- Fixed issues with Predis and replication connections
+- Fixed rare fatal error in `show_error_and_die()` (one more time)
 
 ## 2.5.2
 

README.md

@@ -61,6 +61,7 @@ The Redis Object Cache plugin comes with vast set of configuration options. If y
 | `WP_REDIS_DISABLE_BANNERS`           | `false`     | Disables promotional banners |
 | `WP_REDIS_DISABLE_DROPIN_CHECK`      | `false`     | Disables the extended drop-in write test |
 | `WP_REDIS_DISABLE_DROPIN_AUTOUPDATE` | `false`     | Disables the drop-in auto-update |
+| `WP_REDIS_DISABLE_GROUP_FLUSH`       | `false`     | Disables group flushing with Lua script and uses `flushdb` call instead |
 | `WP_REDIS_SSL_CONTEXT`               | `[]`        | TLS connection options for `tls` or `rediss` scheme |
 
 </details>

includes/object-cache.php

@@ -1762,6 +1762,10 @@ public function flush() {
 	 * @return bool Returns TRUE on success or FALSE on failure.
 	 */
     public function flush_group( $group ) {
+        if ( defined( 'WP_REDIS_DISABLE_GROUP_FLUSH' ) && WP_REDIS_DISABLE_GROUP_FLUSH ) {
+            return $this->flush();
+        }
+
         $san_group = $this->sanitize_key_part( $group );
 
         if ( is_multisite() && ! $this->is_global_group( $san_group ) ) {
@@ -2965,6 +2969,8 @@ protected function show_error_and_die( Exception $exception ) {
             add_filter( 'pre_determine_locale', function () {
                 return defined( 'WPLANG' ) ? WPLANG : 'en_US';
             } );
+
+            add_filter( 'pre_get_language_files_from_path', '__return_empty_array' );
         }
 
         // Load custom Redis error template, if present.