Mirrors/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-02-20 19:56:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added option to ignore parent page ACL

Browse Source
This commit is contained in:
Matias Griese 2020-01-02 15:01:54 +02:00
parent 6f38933e81
commit 508cf1ffdb
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@
1. [](#bugfix)
* Grav 1.7: Fixed error on page initialization [#2753](https://github.com/getgrav/grav/issues/2753)
* Fixed checking ACL for another user (who is not currently logged in) in a Flex Object or Directory
* Fixed bug in Windows where `Filesystem::dirname()` returns backslashes
# v1.7.0-rc.2
## 12/04/2019

10
system/src/Grav/Framework/Filesystem/Filesystem.php
View File

@ -176,6 +176,11 @@ class Filesystem implements FilesystemInterface
return [$scheme, ''];
}
// In Windows dirname() may return backslashes, fix that.
if (DIRECTORY_SEPARATOR !== '/') {
$path = str_replace('\\', '/', $path);
}
return [$scheme, $path];
}
@ -199,6 +204,11 @@ class Filesystem implements FilesystemInterface
$dirname = isset($info['dirname']) && $info['dirname'] !== '.' ? $info['dirname'] : null;
if (null !== $dirname) {
// In Windows dirname may be using backslashes, fix that.
if (DIRECTORY_SEPARATOR !== '/') {
$dirname = str_replace('\\', '/', $dirname);
}
$info['dirname'] = $scheme . '://' . $dirname;
} else {
$info = ['dirname' => $scheme . '://'] + $info;