From 4b36aab5fadf9dc63c87bcbaffe777825f9ea431 Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Tue, 21 Jul 2015 12:18:30 +0100
Subject: [PATCH] Issue #2531972 by dawehner: Move ThemeManager::theme() to
ThemeManager::render()
---
core/lib/Drupal/Core/Theme/ThemeManager.php | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/core/lib/Drupal/Core/Theme/ThemeManager.php b/core/lib/Drupal/Core/Theme/ThemeManager.php
index b7eff0bdd98c..31c10a739496 100644
--- a/core/lib/Drupal/Core/Theme/ThemeManager.php
+++ b/core/lib/Drupal/Core/Theme/ThemeManager.php
@@ -93,13 +93,6 @@ public function setThemeRegistry(Registry $theme_registry) {
return $this;
}
- /**
- * {@inheritdoc}
- */
- public function render($hook, array $variables) {
- return $this->theme($hook, $variables);
- }
-
/**
* {@inheritdoc}
*/
@@ -137,11 +130,9 @@ public function setActiveTheme(ActiveTheme $active_theme) {
}
/**
- * Generates themed output (internal use only).
- *
- * @see \Drupal\Core\Render\RendererInterface::render();
+ * {@inheritdoc}
*/
- protected function theme($hook, $variables = array()) {
+ public function render($hook, array $variables) {
static $default_attributes;
$active_theme = $this->getActiveTheme();
--
GitLab