Merge branch 'develop' into feature/plugin-check

rhubarbgroup · Jan 23, 2025 · c06eb61 · c06eb61
2 parents e302d9f + b25f391
commit c06eb61
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/includes/object-cache.php b/includes/object-cache.php
@@ -1151,11 +1151,16 @@ public function fetch_info() {
             if ( $this->is_predis() ) {
                 $connection = $this->redis->getConnection();
                 if ( $connection instanceof Predis\Connection\Replication\ReplicationInterface ) {
+                    $node = $connection->getCurrent();
                     $connection->switchToMaster();
                 }
             }
 
             $info = $this->redis->info();
+
+            if ( isset( $connection, $node ) ) {
+                $connection->switchTo($node);
+            }
         }
 
         if ( isset( $info['redis_version'] ) ) {

diff --git a/redis-cache.php b/redis-cache.php
@@ -11,6 +11,7 @@
  * Author: Till Krüss
  * Author URI: https://objectcache.pro
  * GitHub Plugin URI: https://github.com/rhubarbgroup/redis-cache
+ * Primary Branch: main
  * License: GPLv3
  * License URI: http://www.gnu.org/licenses/gpl-3.0.html
  *