Merge remote-tracking branch 'origin/1.11.x' into 1.11.x

AngelFQC · AngelFQC · commit 86222db7e244 · 2025-06-04T09:38:26.000-05:00
diff --git a/main/admin/user_import.php b/main/admin/user_import.php
@@ -50,8 +50,10 @@ function createDirectory(?string $path = null): ?string
                 $fp = fopen($data.'/.htaccess', 'w');
                 if ($fp) {
                     fwrite($fp, $block);
+                    fclose($fp);
+                } else {
+                    error_log("Failed to open .htaccess file in $data for writing.");
                 }
-                fclose($fp);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,10 @@ function createDirectory(?string $path = null): ?string`
`50`	`50`	`$fp = fopen($data.'/.htaccess', 'w');`
`51`	`51`	`if ($fp) {`
`52`	`52`	`fwrite($fp, $block);`
	`53`	`+ fclose($fp);`
	`54`	`+ } else {`
	`55`	`+ error_log("Failed to open .htaccess file in $data for writing.");`
`53`	`56`	`}`
`54`		`- fclose($fp);`
`55`	`57`	`}`
`56`	`58`	`}`
`57`	`59`	`}`