summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries2013-05-24 20:58:57 (GMT)
committer Dries2013-05-24 20:58:57 (GMT)
commitdc28748c53f0af82af663132c84eb2a94da6a186 (patch)
tree422c39ade3506c7b21779f4c3a469e4586bfcae8
parent1c3bc1dce58ac53d3f88958aedc51249e0a73117 (diff)
Issue #2003578 by Jon Pugh, joelpittet: Fixed 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.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/lib/Drupal/Core/CoreBundle.php b/core/lib/Drupal/Core/CoreBundle.php
index 2d85f6a..01fb029 100644
--- a/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -99,7 +99,9 @@ class CoreBundle extends Bundle {
// This is saved / loaded via drupal_php_storage().
// All files can be refreshed by clearing caches.
// @todo ensure garbage collection of expired files.
- 'cache' => settings()->get('twig_cache', TRUE),
+ // 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),
'base_template_class' => 'Drupal\Core\Template\TwigTemplate',
// @todo Remove in followup issue
// @see http://drupal.org/node/1712444.