Merge pull request #44 from hexadog/develop

gaetan-hexadog · web-flow · commit a9f959a07079 · 2022-05-07T14:14:12.000+02:00
fix(theme): typo default view paths access
diff --git a/src/Theme.php b/src/Theme.php
@@ -56,6 +56,7 @@ public function __construct($path)
         if ($this->isActive()) {
             // Add theme.THEME_NAME namespace to be able to force views from specific theme
             View::prependNamespace('theme.' . $this->getSnakeName(), $this->getPath('resources/views'));
+            View::replaceNamespace('theme', $this->getPath('resources/views'));
         }
     }
 
@@ -440,10 +441,10 @@ protected function registerViews($defaultViewPaths, $defaultMailViewPaths)
         }, $paths);
 
         // Update config view.paths to work with errors views
-        if (is_array($this->defaultViewPaths)) {
+        if (is_array($defaultViewPaths)) {
             Config::set('view.paths', array_merge($paths, $defaultViewPaths));
         } else {
-            Config::set('view.paths', $paths);
+            Config::set('view.paths', array_merge($paths, [$defaultViewPaths]));
         }
 
         // Register all vendor views

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ public function __construct($path)`
`56`	`56`	`if ($this->isActive()) {`
`57`	`57`	`// Add theme.THEME_NAME namespace to be able to force views from specific theme`
`58`	`58`	`View::prependNamespace('theme.' . $this->getSnakeName(), $this->getPath('resources/views'));`
	`59`	`+ View::replaceNamespace('theme', $this->getPath('resources/views'));`
`59`	`60`	`}`
`60`	`61`	`}`
`61`	`62`
`@@ -440,10 +441,10 @@ protected function registerViews($defaultViewPaths, $defaultMailViewPaths)`
`440`	`441`	`}, $paths);`
`441`	`442`
`442`	`443`	`// Update config view.paths to work with errors views`
`443`		`- if (is_array($this->defaultViewPaths)) {`
	`444`	`+ if (is_array($defaultViewPaths)) {`
`444`	`445`	`Config::set('view.paths', array_merge($paths, $defaultViewPaths));`
`445`	`446`	`} else {`
`446`		`- Config::set('view.paths', $paths);`
	`447`	`+ Config::set('view.paths', array_merge($paths, [$defaultViewPaths]));`
`447`	`448`	`}`
`448`	`449`
`449`	`450`	`// Register all vendor views`