Fix path normalization (broke paths containing '+' characters).
This commit is contained in:
parent
f56a67af9e
commit
61301b3f98
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
function normalize_path($path, $trailing_slash = false) {
|
function normalize_path($path, $trailing_slash = false) {
|
||||||
|
|
||||||
$path = preg_replace("#\\+|/+#", "/", $path);
|
$path = preg_replace("#\\\\+|/+#", "/", $path);
|
||||||
return preg_match("#^(\w:)?/$#", $path) ? $path : (rtrim($path, "/") . ($trailing_slash ? "/" : ""));
|
return preg_match("#^(\w:)?/$#", $path) ? $path : (rtrim($path, "/") . ($trailing_slash ? "/" : ""));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user