Improve the Views service

nova-framework · Apr 30, 2018 · c001e12 · c001e12
1 parent 5815f9d
commit c001e12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Foundation/Application.php b/src/Foundation/Application.php
@@ -41,7 +41,7 @@ class Application extends Container implements ResponsePreparerInterface
      *
      * @var string
      */
-    const VERSION = '4.0.47';
+    const VERSION = '4.0.48';
 
     /**
      * Indicates if the application has "booted".

diff --git a/src/View/FileViewFinder.php b/src/View/FileViewFinder.php
@@ -103,7 +103,7 @@ protected function findNamedPathView($name)
 
         $paths = $this->hints[$namespace];
 
-        if (Str::endsWith($path = head($this->paths), DS .'Override')) {
+        if (Str::endsWith($path = head($this->paths), DS .'Overrides')) {
             $path = $path .DS .'Packages' .DS .$namespace;
 
             if (! in_array($path, $paths) && $this->files->isDirectory($path)) {
@@ -277,12 +277,12 @@ public function overridesFrom($namespace)
         // The folder of Views Override should be located in the same directory with the Views one.
         // For example: <BASEPATH>/themes/Bootstrap/Views -> <BASEPATH>/themes/Bootstrap/Override
 
-        $path = dirname(head($paths)) .DS .'Override';
+        $path = dirname(head($paths)) .DS .'Overrides';
 
         if (! in_array($path, $this->paths) && $this->files->isDirectory($path)) {
             // If there was previously added another Views overriding path, we will remove it.
 
-            if (Str::endsWith(head($this->paths), DS .'Override')) {
+            if (Str::endsWith(head($this->paths), DS .'Overrides')) {
                 array_shift($this->paths);
             }