From c3645d90761874de8471bccce68e18dcfcd73c8a Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Mon, 22 Dec 2025 20:57:18 +0000
Subject: [PATCH 1/2] Fix bug in userDir

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 libraries/classes/Util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 7d957f42a8..d02f7c6d05 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -1253,7 +1253,7 @@ class Util
     public static function userDir(string $dir): string
     {
         // add trailing slash
-        if (mb_substr($dir, -1) !== '/') {
+        if ($dir !== '' && mb_substr($dir, -1) !== '/') {
             $dir .= '/';
         }
 

From d425a16078902b6fcdf9204a38010e20403c22c6 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Mon, 22 Dec 2025 22:16:57 +0000
Subject: [PATCH 2/2] Use early exit

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 libraries/classes/Util.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index d02f7c6d05..e0f5bbf10e 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -1252,8 +1252,12 @@ class Util
      */
     public static function userDir(string $dir): string
     {
+        if ($dir === '') {
+            return '';
+        }
+
         // add trailing slash
-        if ($dir !== '' && mb_substr($dir, -1) !== '/') {
+        if (mb_substr($dir, -1) !== '/') {
             $dir .= '/';
         }