diff --git a/core/includes/common.inc b/core/includes/common.inc index ef929e2..18ed1d5 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -3033,7 +3033,7 @@ function drupal_render(&$elements, $is_recursive_call = FALSE) { // callbacks and return the final markup. if (isset($elements['#cache'])) { $cached_element = drupal_render_cache_get($elements); - if (FALSE && $cached_element !== FALSE) { + if ($cached_element !== FALSE) { $elements = $cached_element; // Only when we're not in a recursive drupal_render() call, // #post_render_cache callbacks must be executed, to prevent breaking the diff --git a/core/lib/Drupal/Core/CoreServiceProvider.php b/core/lib/Drupal/Core/CoreServiceProvider.php index bf483a6..3dc17a1 100644 --- a/core/lib/Drupal/Core/CoreServiceProvider.php +++ b/core/lib/Drupal/Core/CoreServiceProvider.php @@ -84,7 +84,7 @@ public static function registerTwig(ContainerBuilder $container) { $twig_extension = new Definition('Drupal\Core\Template\TwigExtension'); $twig_extension->addMethodCall('setGenerators', array(new Reference('url_generator'))); - $twig_extension->addMethodCall('setLinkGenerator', array(new Reference('link_generator'))); + $twig_extension->addMethodCall('setLinkGenerator', array(new Reference('link_generator'))); $container->register('twig', 'Drupal\Core\Template\TwigEnvironment') ->addArgument(new Reference('twig.loader'))