From 32c7891942359507be230e50b2e09409b42b68b3 Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Mon, 5 Nov 2018 14:35:58 -0600 Subject: [PATCH] Minor changes --- modules/cms/classes/AutoDatasource.php | 2 ++ modules/cms/classes/Theme.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/cms/classes/AutoDatasource.php b/modules/cms/classes/AutoDatasource.php index 5a06b1e88..58cde30a0 100644 --- a/modules/cms/classes/AutoDatasource.php +++ b/modules/cms/classes/AutoDatasource.php @@ -9,6 +9,8 @@ use October\Rain\Halcyon\Datasource\DatasourceInterface; /** * Datasource that loads from other data sources automatically + * + * @Todo: Need to prevent softdeleted DB records from appearing, even if they exist in the filesystem */ class AutoDatasource extends Datasource implements DatasourceInterface { diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php index 3fc0c467d..f688c2657 100644 --- a/modules/cms/classes/Theme.php +++ b/modules/cms/classes/Theme.php @@ -519,7 +519,7 @@ class Theme $enableDbLayer = !Config::get('app.debug'); } - if ($enableDbLayer) { + if ($enableDbLayer && App::hasDatabase()) { $datasource = new AutoDatasource([ new DbDatasource($this->dirName, 'cms_theme_contents'), new FileDatasource($this->getPath(), App::make('files')),