diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-10-04 03:26:58 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-10-04 03:26:58 +0400 |
| commit | a70335529e65976a6dffe466bada632f34b0de45 (patch) | |
| tree | dc231ee4a9b59906be9fbc851a227da0c31e4983 /core/AssetManager.php | |
| parent | 0be047a42c1944c5cf602c561133f23ef62e6a7a (diff) | |
Improving Themes Manage, fix css bug with merged assets disabled
When config file couldnt be written, reporting the error to user very clearly
Diffstat (limited to 'core/AssetManager.php')
| -rw-r--r-- | core/AssetManager.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/AssetManager.php b/core/AssetManager.php index 3975ec6de0..2c80ab6c8a 100644 --- a/core/AssetManager.php +++ b/core/AssetManager.php @@ -285,7 +285,7 @@ class AssetManager // We look for the currently enabled theme and add CSS from the json $theme = PluginsManager::getInstance()->getThemeEnabled(); - if($theme) { + if($theme && $theme->getPluginName() != PluginsManager::DEFAULT_THEME) { $info = $theme->getInformation(); if(isset($info['stylesheet'])) { $themeStylesheetFile = 'plugins/'. $theme->getPluginName() . '/' . $info['stylesheet']; |