Skip to content

Commit

Permalink
Fixed error pages not being overridden
Browse files Browse the repository at this point in the history
  • Loading branch information
kaidesu committed Apr 2, 2020
1 parent 325d482 commit 4efda95
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ and this package adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [7.2.0] - 2020-04-02
### Added
- Laravel 7 support

### Fixed
- Error pages (`errors/404.blade.php`) can now properly be overridden by your themes

### Removed
- Experimental Composer installers package

## [7.1.0] - 2020-02-06
### Changed
- Refactored autoloader to utilize `spl_autoload_register` natively instead of Composer
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"prefer-stable": true,
"require": {
"php": "^7.2",
"caffeinated/composer-installers": "*",
"illuminate/support": "^6.0"
"illuminate/support": "^6.0|^7.0"
},
"autoload": {
"files": [
Expand Down
1 change: 1 addition & 0 deletions src/View/ThemeViewFinder.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ protected function addThemeNamespaceHints($namespace)
$theme = Theme::getCurrent();

$hints = array_reverse($this->hints[$namespace]);
$hints[] = Theme::path('resources/views/'.$namespace);
$hints[] = Theme::path('resources/views/vendor/'.$namespace);

if (class_exists(\Caffeinated\Modules\ModulesServiceProvider::class)) {
Expand Down

0 comments on commit 4efda95

Please sign in to comment.