Merge branch 'develop' into 1.7

# Conflicts:
#	system/src/Grav/Common/Service/PagesServiceProvider.php
This commit is contained in:
Andy Miller
2020-02-11 17:10:48 -07:00

View File

@@ -26,7 +26,7 @@ class PagesServiceProvider implements ServiceProviderInterface
return new Pages($grav);
};
if (GRAV_CLI) {
if (\defined('GRAV_CLI')) {
$container['page'] = static function (Grav $grav) {
$path = $grav['locator']->findResource('system://pages/notfound.md');
$page = new Page();