Fixed loading textdomain in show_error_and_die() (#511)

rhubarbgroup · Mar 12, 2024 · b582fba · b582fba
1 parent 5cd5c0c
commit b582fba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Reverted behavioral change to `sanitize_key_part()`
+- Actually fix rare fatal error in `show_error_and_die()`
 
 ## 2.5.1
 

diff --git a/includes/object-cache.php b/includes/object-cache.php
@@ -2899,15 +2899,17 @@ protected function handle_exception( $exception ) {
      * @return void
      */
     protected function show_error_and_die( Exception $exception ) {
-        if ( ! function_exists( 'get_template_directory' ) ) {
-            require_once ABSPATH . WPINC . '/theme.php';
-        }
-
         wp_load_translations_early();
 
-        add_filter( 'pre_determine_locale', function () {
-            return defined( 'WPLANG' ) ? WPLANG : 'en_US';
-        } );
+        $domain = 'redis-cache';
+        $locale = defined( 'WPLANG' ) ? WPLANG : 'en_US';
+        $mofile = WP_LANG_DIR . "/plugins/{$domain}-{$locale}.mo";
+
+        if ( load_textdomain( $domain, $mofile, $locale ) === false ) {
+            add_filter( 'pre_determine_locale', function () {
+                return defined( 'WPLANG' ) ? WPLANG : 'en_US';
+            } );
+        }
 
         // Load custom Redis error template, if present.
         if ( file_exists( WP_CONTENT_DIR . '/redis-error.php' ) ) {