From c0771678a7b0d2bb73e582cb1a18435d77a6cc48 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Fri, 29 Mar 2013 11:02:49 -0700
Subject: [PATCH] Issue #1942490 by steveoliver, Cottser: Make Twig engine
 available during install.

---
 core/includes/install.core.inc      | 4 ++++
 core/lib/Drupal/Core/CoreBundle.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 2395f70429a..bb8f247ced1 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1,6 +1,7 @@
 <?php
 
 use Drupal\Core\DrupalKernel;
+use Drupal\Core\CoreBundle;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Database\Install\TaskException;
 use Drupal\Core\Language\Language;
@@ -387,6 +388,9 @@ function install_begin_request(&$install_state) {
       ->register('keyvalue.expirable.null', 'Drupal\Core\KeyValueStore\KeyValueNullExpirableFactory');
     $conf['keyvalue_expirable_default'] = 'keyvalue.expirable.null';
 
+    // Register Twig template engine for use during install.
+    CoreBundle::registerTwig($container);
+
     Drupal::setContainer($container);
   }
 
diff --git a/core/lib/Drupal/Core/CoreBundle.php b/core/lib/Drupal/Core/CoreBundle.php
index 91a7d0144b5..ee63bfa771a 100644
--- a/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -385,7 +385,7 @@ class CoreBundle extends Bundle {
   /**
    * Registers Twig services.
    */
-  protected function registerTwig(ContainerBuilder $container) {
+  public static function registerTwig(ContainerBuilder $container) {
     $container->register('twig.loader.filesystem', 'Twig_Loader_Filesystem')
       ->addArgument(DRUPAL_ROOT);
     $container->setAlias('twig.loader', 'twig.loader.filesystem');