summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2013-05-24 22:00:31 (GMT)
committer Alex Pott2013-05-24 22:00:31 (GMT)
commit94e3e87a4aef0c573dc053ebf127d88fb604ca8e (patch)
tree4c5efdcdefe5497091f3eeb683e32f2a781b0941
parent6b2892bc8532a89f6ea7fee2da442549bb89c301 (diff)
Issue #2003578 followup by chx: twig_cache() must be FALSE in install.php registerTwig because we don't know if files folder is writable yet.
-rw-r--r--core/lib/Drupal/Core/CoreBundle.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/lib/Drupal/Core/CoreBundle.php b/core/lib/Drupal/Core/CoreBundle.php
index 01fb029..d29da83 100644
--- a/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -101,7 +101,7 @@ class CoreBundle extends Bundle {
// @todo ensure garbage collection of expired files.
// When in the installer, twig_cache must be FALSE until we know the
// files folder is writable.
- 'cache' => ((MAINTENANCE_MODE != 'install') ? settings()->get('twig_cache', TRUE) : FALSE),
+ 'cache' => drupal_installation_attempted() ? FALSE : settings()->get('twig_cache', TRUE),
'base_template_class' => 'Drupal\Core\Template\TwigTemplate',
// @todo Remove in followup issue
// @see http://drupal.org/node/1712444.