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

Post merge fixes

Browse Source
This commit is contained in:
Matias Griese
2014-09-03 10:33:45 +03:00
parent f606999c40
commit 30246a8666
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
system/src/Grav/Common/Themes.php
View File

@@ -1,10 +1,9 @@
<?php
namespace Grav\Common;
use Grav\Common\File\CompiledYaml;
use Grav\Component\Data\Blueprints;
use Grav\Component\Data\Data;
use Grav\Component\Filesystem\File;
use Grav\Common\Filesystem\File\Yaml;
use Grav\Component\Filesystem\ResourceLocator;
/**
@@ -77,11 +76,11 @@ class Themes
}
// Load default configuration.
$file = Yaml::instance("theme:///{$name}/{$name}.yaml");
$file = CompiledYaml::instance("theme:///{$name}/{$name}.yaml");
$obj = new Data($file->content(), $blueprint);
// Override with user configuration.
$file = Yaml::instance("user://config/themes/{$name}.yaml");
$file = CompiledYaml::instance("user://config/themes/{$name}.yaml");
$obj->merge($file->content());
// Save configuration always to user/config.
@@ -140,9 +139,7 @@ class Themes
/** @var Config $config */
$config = $this->grav['config'];
$themeConfig = Yaml::instance(THEMES_DIR . "{$name}/{$name}.yaml")->content();
$config->merge(['themes' => [$name => $themeConfig]]);
$this->loadConfiguration($name, $config);
/** @var ResourceLocator $locator */
$locator = $this->grav['locator'];
@@ -151,7 +148,7 @@ class Themes
$registered = stream_get_wrappers();
$schemes = $config->get(
"themes.{$name}.streams.schemes",
['theme' => ['paths' => ["user/themes/{$name}"]]]
['theme' => ['paths' => $locator->findResources("theme:///{$name}")]]
);
foreach ($schemes as $scheme => $config) {
@@ -178,4 +175,11 @@ class Themes
}
}
protected function loadConfiguration($name, Config $config)
{
$themeConfig = CompiledYaml::instance(THEMES_DIR . "{$name}/{$name}.yaml")->content();
$config->merge(['themes' => [$name => $themeConfig]]);
}
}