Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tillkruss committed Jun 29, 2023
2 parents 89e69d6 + cbc51a3 commit 326d8a1
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 12 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## 2.4.3

- Fixed PHP `<=7.2` syntax error
- Fixed loading error-page translations

## 2.4.2

- Made admin-bar script more robust
Expand Down
8 changes: 6 additions & 2 deletions includes/object-cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Redis Object Cache Drop-In
* Plugin URI: https://wordpress.org/plugins/redis-cache/
* Description: A persistent object cache backend powered by Redis. Supports Predis, PhpRedis, Relay, replication, sentinels, clustering and WP-CLI.
* Version: 2.4.2
* Version: 2.4.3
* Author: Till Krüss
* Author URI: https://objectcache.pro
* License: GPLv3
Expand Down Expand Up @@ -2894,6 +2894,10 @@ protected function handle_exception( $exception ) {
protected function show_error_and_die( Exception $exception ) {
wp_load_translations_early();

add_filter( 'pre_determine_locale', function () {
return defined( 'WPLANG' ) ? WPLANG : 'en_US';
} );

// Load custom DB error template, if present.
if ( file_exists( WP_CONTENT_DIR . '/redis-error.php' ) ) {
require_once WP_CONTENT_DIR . '/redis-error.php';
Expand Down Expand Up @@ -2931,7 +2935,7 @@ protected function show_error_and_die( Exception $exception ) {
// translators: %1$s = Formatted object-cache.php file name, %2$s = Formatted wp-content directory name.
__( 'To disable Redis, delete the %1$s file in the %2$s directory.', 'redis-cache' ),
'<code>object-cache.php</code>',
'<code>/wp-content/</code>',
'<code>/wp-content/</code>'
) . "</p>\n";

wp_die( $message );
Expand Down
16 changes: 8 additions & 8 deletions languages/redis-cache.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# This file is distributed under the GPLv3.
msgid ""
msgstr ""
"Project-Id-Version: Redis Object Cache 2.4.2\n"
"Project-Id-Version: Redis Object Cache 2.4.3\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/redis-cache\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2023-06-28T12:54:55+00:00\n"
"POT-Creation-Date: 2023-06-29T10:40:20+00:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: WP-CLI 2.8.1\n"
"X-Domain: redis-cache\n"
Expand Down Expand Up @@ -294,30 +294,30 @@ msgstr ""
msgid "Object cache drop-in could not be updated. Redis server is unreachable: %s"
msgstr ""

#: includes/object-cache.php:2907
#: includes/object-cache.php:2911
msgid "Error establishing a Redis connection"
msgstr ""

#. translators: %s = Formatted wp-config.php file name.
#: includes/object-cache.php:2914
#: includes/object-cache.php:2918
msgid "WordPress is unable to establish a connection to Redis. This means that the connection information in your %s file are incorrect, or that the Redis server is not reachable."
msgstr ""

#: includes/object-cache.php:2919
#: includes/object-cache.php:2923
msgid "Is the correct Redis host and port set?"
msgstr ""

#: includes/object-cache.php:2920
#: includes/object-cache.php:2924
msgid "Is the Redis server running?"
msgstr ""

#. translators: %s = Link to installation instructions.
#: includes/object-cache.php:2925
#: includes/object-cache.php:2929
msgid "If you need help, please read the <a href=\"%s\">installation instructions</a>."
msgstr ""

#. translators: %1$s = Formatted object-cache.php file name, %2$s = Formatted wp-content directory name.
#: includes/object-cache.php:2932
#: includes/object-cache.php:2936
msgid "To disable Redis, delete the %1$s file in the %2$s directory."
msgstr ""

Expand Down
7 changes: 6 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Tags: redis, object cache, cache, object caching, caching performance, relay, pr
Requires at least: 3.3
Tested up to: 6.2
Requires PHP: 7.2
Stable tag: 2.4.2
Stable tag: 2.4.3
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -62,6 +62,11 @@ Redis Object Cache has various WP CLI commands, for more information run `wp hel

== Changelog ==

= 2.4.3 =

- Fixed PHP `<=7.2` syntax error
- Fixed loading error-page translations

= 2.4.2 =

- Made admin-bar script more robust
Expand Down
2 changes: 1 addition & 1 deletion redis-cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Redis Object Cache
* Plugin URI: https://wordpress.org/plugins/redis-cache/
* Description: A persistent object cache backend powered by Redis. Supports Predis, PhpRedis, Relay, replication, sentinels, clustering and WP-CLI.
* Version: 2.4.2
* Version: 2.4.3
* Text Domain: redis-cache
* Domain Path: /languages
* Network: true
Expand Down

0 comments on commit 326d8a1

Please sign in to comment.