From fbe936cef78e977430777cfe9186f3159bd22d0b Mon Sep 17 00:00:00 2001
From: Wehr Mario <m.wehr@fh-kaernten.at>
Date: Mon, 24 Apr 2023 20:12:06 +0200
Subject: [PATCH] MDL-78004 cache: Fix deprecated null value in Redis connect

---
 cache/stores/redis/lib.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/cache/stores/redis/lib.php b/cache/stores/redis/lib.php
index 84b07cf02ae..e1585ae9025 100644
--- a/cache/stores/redis/lib.php
+++ b/cache/stores/redis/lib.php
@@ -196,12 +196,16 @@ class cachestore_redis extends cache_store implements cache_is_key_aware, cache_
      */
     protected function new_redis($server, $prefix = '', $password = '') {
         $redis = new Redis();
-        // Check if it isn't a Unix socket to set default port.
-        $port = ($server[0] === '/') ? null : 6379;
-        if (strpos($server, ':')) {
-            $serverconf = explode(':', $server);
-            $server = $serverconf[0];
-            $port = $serverconf[1];
+        // Check for Unix socket.
+        if ($server[0] === '/') {
+            $port = 0;
+        } else {
+            $port = 6379; // No Unix socket so set default port.
+            if (strpos($server, ':')) { // Check for custom port.
+                $serverconf = explode(':', $server);
+                $server = $serverconf[0];
+                $port = $serverconf[1];
+            }
         }
 
         try {