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

Changed page search to use SPL GlobIterator and more robust regex. Ever so slightly faster too! #995

Browse Source
This commit is contained in:
Andy Miller 2016-08-21 09:39:45 -06:00
parent ae7c43bcfd
commit 9e2cd09cd7
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@
1. [](#bugfix)
* Fix for lightbox media function throwing error [#981](https://github.com/getgrav/grav/issues/981)
* Removed 307 redirect code option as it is not well supported [#743](https://github.com/getgrav/grav-plugin-admin/issues/743)
* Fixed issue with folders with name `*.md` are not confused with pages [#995](https://github.com/getgrav/grav/issues/995)
# v1.1.2
## 08/10/2016

25
system/src/Grav/Common/Page/Pages.php
View File

@ -846,14 +846,22 @@ class Pages
}
$content_exists = false;
$pages_found = glob($directory . '/*' . CONTENT_EXT);
$pages_found = new \GlobIterator($directory . '/*' . CONTENT_EXT);
$page_found = null;
$page_extension = '';
if ($pages_found) {
if ($pages_found and $pages_found->count() > 0) {
$page_extensions = $language->getFallbackPageExtensions();
foreach ($page_extensions as $extension) {
foreach ($pages_found as $found) {
if (preg_match('/^.*\/[0-9A-Za-z\-\_]+(' . $extension . ')$/', $found)) {
if ($found->isDir()) {
continue;
}
$regex = '/' . preg_quote($extension) . '$/';
if (preg_match($regex, $found->getFilename())) {
$page_found = $found;
$page_extension = $extension;
break 2;
@ -863,8 +871,7 @@ class Pages
}
if ($parent && !empty($page_found)) {
$file = new \SplFileInfo($page_found);
$page->init($file, $page_extension);
$page->init($page_found, $page_extension);
$content_exists = true;
@ -1065,12 +1072,12 @@ class Pages
} else {
// else just sort the list according to specified key
if (extension_loaded('intl')) {
$locale = setlocale(LC_COLLATE, 0); //`setlocale` with a 0 param returns the current locale set
$col = \Collator::create($locale);
$locale = setlocale(LC_COLLATE, 0); //`setlocale` with a 0 param returns the current locale set
$col = \Collator::create($locale);
if ($col) {
$col->asort($list, $sort_flags);
$col->asort($list, $sort_flags);
} else {
asort($list, $sort_flags);
asort($list, $sort_flags);
}
} else {
asort($list, $sort_flags);