Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-06 20:41:36 +01:00
Code Issues Packages Projects Releases Activity

use FilesystemIterator to solve windows path issue more elegantly

Browse Source
This commit is contained in:
Gert
2015-04-08 22:55:27 +02:00
parent 6c93483220
commit f956d7113f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
system/src/Grav/Common/Page/Media.php
View File

@@ -40,14 +40,14 @@ class Media extends Getters
$this->path = $path;
$iterator = new \DirectoryIterator($path);
$iterator = new \FilesystemIterator($path, \FilesystemIterator::UNIX_PATHS | \FilesystemIterator::SKIP_DOTS);
$media = [];
/** @var \DirectoryIterator $info */
foreach ($iterator as $info) {
foreach ($iterator as $path => $info) {
// Ignore folders and Markdown files.
if ($info->isDot() || !$info->isFile() || $info->getExtension() == 'md') {
if (!$info->isFile() || $info->getExtension() == 'md') {
continue;
}
@@ -58,9 +58,9 @@ class Media extends Getters
if ($type === 'alternative') {
$media["{$basename}.{$ext}"][$type] = isset($media["{$basename}.{$ext}"][$type]) ? $media["{$basename}.{$ext}"][$type] : [];
$media["{$basename}.{$ext}"][$type][$extra] = str_replace(DIRECTORY_SEPARATOR, DS, $info->getPathname());
$media["{$basename}.{$ext}"][$type][$extra] = $path;
} else {
$media["{$basename}.{$ext}"][$type] = str_replace(DIRECTORY_SEPARATOR, DS, $info->getPathname());
$media["{$basename}.{$ext}"][$type] = $path;
}
}