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

Merge branch 'develop' into feature/gpm

Browse Source
This commit is contained in:
Djamil Legato
2014-10-01 12:42:30 -07:00
parent eb1883854e a3c58fcc5a
commit acd81eb7c3
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
system/src/Grav/Common/Config/Config.php
View File

@@ -39,6 +39,12 @@ class Config extends Data
'' => ['user/plugins'],
]
],
'plugin' => [
'type' => 'ReadOnlyStream',
'prefixes' => [
'' => ['user/plugins'],
]
],
'themes' => [
'type' => 'ReadOnlyStream',
'prefixes' => [

4
system/src/Grav/Common/Page/Page.php
View File

@@ -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;
}
}

2
system/src/Grav/Common/Service/StreamsServiceProvider.php
View File

@@ -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;