Skip to content

Commit d6bd3f0

Browse files
committed
Merge pull request #12 from Flynsarmy/revert-11-master
Revert "Bug fix: name of config file was wrong"
2 parents ee2c203 + dcbe59e commit d6bd3f0

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

src/Flynsarmy/DbBladeCompiler/DbBladeCompiler.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ class DbBladeCompiler extends BladeCompiler implements CompilerInterface
1212
public function __construct($filesystem, $cache_path, $config)
1313
{
1414
parent::__construct($filesystem, $cache_path);
15-
$this->rawTags = Blade::getRawTags();
16-
$this->contentTags = Blade::getContentTags();
17-
$this->escapedTags = Blade::getEscapedContentTags();
18-
$this->extensions = Blade::getExtensions();
19-
$this->config = $config;
15+
$this->config = $config;
2016
}
2117

2218
/**
@@ -79,7 +75,7 @@ public function getCompiledPath($model)
7975
*/
8076
public function isExpired($path)
8177
{
82-
if(!$this->config->get('db-blade-compiler.cache'))
78+
if(!$this->config->get('cache'))
8379
{
8480
return true;
8581
}

src/Flynsarmy/DbBladeCompiler/DbBladeCompilerServiceProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function boot()
3434
public function register()
3535
{
3636
$config_path = __DIR__ . '/../../../config/db-blade-compiler.php';
37-
$this->mergeConfigFrom($config_path, 'db-blade-compiler');
37+
$this->mergeConfigFrom($config_path, 'db-blade-compile');
3838

3939
$this->app['dbview'] = $this->app->share(function($app)
4040
{

0 commit comments

Comments
 (0)