Issue #1942490 by steveoliver, Cottser: Make Twig engine available during install.

8.0.x
webchick 2013-03-29 11:02:49 -07:00
parent 3b44941302
commit c0771678a7
2 changed files with 5 additions and 1 deletions

View File

@ -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);
}

View File

@ -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');