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

Add support for extending system page types

Browse Source
This commit is contained in:
Matias Griese
2016-05-12 17:40:51 +03:00
parent 966308b14a
commit b25eeb9586
2 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
system/src/Grav/Common/Data/Blueprint.php
View File

@@ -130,35 +130,41 @@ class Blueprint extends BlueprintForm
*/
protected function getFiles($path, $context = null)
{
if (is_string($path) && !strpos($path, '://')) {
// Resolve filename.
if (isset($this->overrides[$path])) {
$path = $this->overrides[$path];
} else {
if ($context === null) {
$context = $this->context;
}
if ($context && $context[strlen($context)-1] !== '/') {
$context .= '/';
}
$path = $context . $path;
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
if (!preg_match('/\.yaml$/', $path)) {
$path .= '.yaml';
}
if (is_string($path) && !$locator->isStream($path)) {
// Find path overrides.
$paths = isset($this->overrides[$path]) ? (array) $this->overrides[$path] : [];
// Add path pointing to default context.
if ($context === null) {
$context = $this->context;
}
if ($context && $context[strlen($context)-1] !== '/') {
$context .= '/';
}
$path = $context . $path;
if (!preg_match('/\.yaml$/', $path)) {
$path .= '.yaml';
}
$paths[] = $path;
} else {
$paths = (array) $path;
}
$files = [];
foreach ($paths as $lookup) {
if (is_string($lookup) && strpos($lookup, '://')) {
$files = array_merge($files, $locator->findResources($lookup));
} else {
$files[] = $lookup;
}
}
if (is_string($path) && strpos($path, '://')) {
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
$files = array_unique($locator->findResources($path));
} else {
$files = (array) $path;
}
return $files;
return array_values(array_unique($files));
}
/**

2
system/src/Grav/Common/Data/Blueprints.php
View File

@@ -87,7 +87,9 @@ class Blueprints
$blueprint = new Blueprint($name);
if (is_array($this->search) || is_object($this->search)) {
// Page types.
$blueprint->setOverrides($this->search);
$blueprint->setContext('blueprints://pages');
} else {
$blueprint->setContext($this->search);
}