Minor improvement to comments

remotes/origin/stable5
Sam Tuke 12 years ago
parent 53248a9b60
commit 50faddfa40
  1. 13
      lib/files/filesystem.php

@ -527,8 +527,7 @@ class Filesystem {
} }
/** /**
* normalize a path * @brief Fix common problems with a file path
*
* @param string $path * @param string $path
* @param bool $stripTrailingSlash * @param bool $stripTrailingSlash
* @return string * @return string
@ -537,21 +536,21 @@ class Filesystem {
if ($path == '') { if ($path == '') {
return '/'; return '/';
} }
//no windows style slashes //no windows style slashes
$path = str_replace('\\', '/', $path); $path = str_replace('\\', '/', $path);
//add leading slash //add leading slash
if ($path[0] !== '/') { if ($path[0] !== '/') {
$path = '/' . $path; $path = '/' . $path;
} }
//remove duplicate slashes //remove duplicate slashes
while (strpos($path, '//') !== false) { while (strpos($path, '//') !== false) {
$path = str_replace('//', '/', $path); $path = str_replace('//', '/', $path);
} }
//remove trailing slash //remove trailing slash
if ($stripTrailingSlash and strlen($path) > 1 and substr($path, -1, 1) === '/') { if ($stripTrailingSlash and strlen($path) > 1 and substr($path, -1, 1) === '/') {
$path = substr($path, 0, -1); $path = substr($path, 0, -1);
} }
//normalize unicode if possible //normalize unicode if possible
if (class_exists('Normalizer')) { if (class_exists('Normalizer')) {
$path = \Normalizer::normalize($path); $path = \Normalizer::normalize($path);
} }

Loading…
Cancel
Save