FEATURE: more directory separators for static pages provider

This commit is contained in:
peter
2016-04-04 11:05:09 +02:00
parent 3646c79e1d
commit ccf71dba81
@@ -57,7 +57,7 @@ class StaticPagesServiceProvider extends ServiceProvider
*/ */
protected function registerConfig() protected function registerConfig()
{ {
$config = __DIR__ . '\..\Config\config.php'; $config = __DIR__ . DIRECTORY_SEPARATOR .'..'.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'config.php';
$this->publishes([$config => config_path('staticpages.php')]); $this->publishes([$config => config_path('staticpages.php')]);
$this->mergeConfigFrom($config, 'staticpages'); $this->mergeConfigFrom($config, 'staticpages');
} }
@@ -77,7 +77,7 @@ class StaticPagesServiceProvider extends ServiceProvider
$this->publishes([$sourcePath => $viewPath]); $this->publishes([$sourcePath => $viewPath]);
$this->loadViewsFrom(array_merge(array_map(function ($path) { $this->loadViewsFrom(array_merge(array_map(function ($path) {
return $path . '/modules/staticpages'; return $path . DIRECTORY_SEPARATOR. 'modules'.DIRECTORY_SEPARATOR.'staticpages';
}, \Config::get('view.paths')), [$sourcePath]), 'staticpages'); }, \Config::get('view.paths')), [$sourcePath]), 'staticpages');
/** /**