From 84873484d5b95adc317a750f9e4e73076b5d9503 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Wed, 1 Oct 2014 12:54:10 -0600 Subject: [PATCH 1/3] Typo fix for constant --- system/src/Grav/Common/Page/Page.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php index e0f89ffca..74b17778e 100644 --- a/system/src/Grav/Common/Page/Page.php +++ b/system/src/Grav/Common/Page/Page.php @@ -1136,7 +1136,7 @@ class Page * @param bool $modular|null whether or not to return modular children * @return Collection */ - public function children($type = Page::ALL_PAGES) + public function children($type = Page::STANDARD_PAGES) { /** @var Pages $pages */ $pages = self::$grav['pages']; @@ -1482,7 +1482,7 @@ class Page $results = $this->children(Page::MODULAR_PAGES); break; case 'children': - $results = $this->children(Page::NORMAL_PAGES); + $results = $this->children(Page::STANDARD_PAGES); break; } } From d705530e64a9e7cc2b12361f1f8a220b14decb5b Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Wed, 1 Oct 2014 22:12:13 +0300 Subject: [PATCH 2/3] Add stream "plugin" (alias of "plugins") --- system/src/Grav/Common/Config/Config.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/system/src/Grav/Common/Config/Config.php b/system/src/Grav/Common/Config/Config.php index 58ebacfad..448f5f25b 100644 --- a/system/src/Grav/Common/Config/Config.php +++ b/system/src/Grav/Common/Config/Config.php @@ -39,6 +39,12 @@ class Config extends Data '' => ['user/plugins'], ] ], + 'plugin' => [ + 'type' => 'ReadOnlyStream', + 'prefixes' => [ + '' => ['user/plugins'], + ] + ], 'themes' => [ 'type' => 'ReadOnlyStream', 'prefixes' => [ From a3c58fcc5aad70646f6a85b0ee11070cf37da9be Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Wed, 1 Oct 2014 22:23:29 +0300 Subject: [PATCH 3/3] Fix base directory for streams --- system/src/Grav/Common/Service/StreamsServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/src/Grav/Common/Service/StreamsServiceProvider.php b/system/src/Grav/Common/Service/StreamsServiceProvider.php index 4920f6755..4f19c831f 100644 --- a/system/src/Grav/Common/Service/StreamsServiceProvider.php +++ b/system/src/Grav/Common/Service/StreamsServiceProvider.php @@ -15,7 +15,7 @@ class StreamsServiceProvider implements ServiceProviderInterface $self = $this; $container['locator'] = function($c) use ($self) { - $locator = new UniformResourceLocator; + $locator = new UniformResourceLocator(ROOT_DIR); $self->init($c, $locator); return $locator;