Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-01 19:06:16 +01:00
Code Issues Packages Projects Releases Activity

flipped order

Browse Source
This commit is contained in:
Andy Miller
2019-06-13 09:55:39 -06:00
parent c7b6617905
commit 526e2e097d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
classes/plugin/AdminController.php
View File

@@ -1546,12 +1546,6 @@ class AdminController extends AdminBaseController
];
}
// Simple filter for name or extension
if (($filters['name'] && Utils::contains($payload['basename'], $filters['name'])) ||
($filters['extension'] && Utils::contains($payload['extension'], $filters['extension']))) {
continue;
}
// filter types
if ($filters['type']) {
if (!in_array($payload['type'], $filter_type)) {
@@ -1559,6 +1553,12 @@ class AdminController extends AdminBaseController
}
}
// Simple filter for name or extension
if (($filters['name'] && Utils::contains($payload['basename'], $filters['name'])) ||
($filters['extension'] && Utils::contains($payload['extension'], $filters['extension']))) {
continue;
}
// Add children if any
if ($fileInfo->getPathname() == $extra && is_array($children)) {
$payload['children'] = array_values($children);