diff -u b/core/lib/Drupal/Core/Theme/Registry.php b/core/lib/Drupal/Core/Theme/Registry.php --- b/core/lib/Drupal/Core/Theme/Registry.php +++ b/core/lib/Drupal/Core/Theme/Registry.php @@ -393,7 +393,7 @@ // which will simplify the entire processing in the first place. if ($type == 'module') { $render_engines = array( - '.twig' => 'twig', + '.html.twig' => 'twig', '.tpl.php' => 'phptemplate', ); foreach ($render_engines as $extension => $engine) { diff -u b/core/modules/system/lib/Drupal/system/Tests/Theme/RegistryUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/RegistryUnitTest.php --- b/core/modules/system/lib/Drupal/system/Tests/Theme/RegistryUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Theme/RegistryUnitTest.php @@ -7,7 +7,7 @@ namespace Drupal\system\Tests\Theme; -use Drupal\Core\Theme; +use Drupal\Core\Theme\Registry; use Drupal\simpletest\DrupalUnitTestBase; /** @@ -41,9 +41,18 @@ theme_enable(array('test_theme')); } + /** + * Returns an registry instance for a certain theme. + * + * @param string $theme_name + * The name of the theme, which we need a registry for. + * + * @return \Drupal\Core\Theme\Registry + * Returns a registry instance. + */ protected function getRegistry($theme_name) { if (!isset($this->registries[$theme_name])) { - $this->registries[$theme_name] = new Theme\Registry($this->container->get('cache.theme'), $theme_name); + $this->registries[$theme_name] = new Registry($this->container->get('cache.theme'), $this->container->get('module_handler'), $theme_name); } return $this->registries[$theme_name]; } diff -u b/core/modules/views/views.module b/core/modules/views/views.module --- b/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -178,6 +178,7 @@ $hooks['views_exposed_form'] = $base + array( 'template' => 'views-exposed-form', + 'preprocess' => array('template_preprocess_views_exposed_form'), 'render element' => 'form', );