diff --git a/core/includes/common.inc b/core/includes/common.inc index 78debc7..c169b58 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -4627,6 +4627,11 @@ function drupal_render_page($page) { $page['content']['system_main'] = drupal_set_page_content(); } + // Set page title, if exist. + if (isset($page['#page_title'])) { + drupal_set_title($page['#page_title']); + } + return drupal_render($page); } diff --git a/core/lib/Drupal/Core/Language/LanguageManager.php b/core/lib/Drupal/Core/Language/LanguageManager.php index b4acc6a..01f1d50 100644 --- a/core/lib/Drupal/Core/Language/LanguageManager.php +++ b/core/lib/Drupal/Core/Language/LanguageManager.php @@ -76,12 +76,13 @@ public function setRequest(Request $request) { * Returns a language object for the given type. * * @param string $type - * The language type, e.g. Language::TYPE_INTERFACE. + * (optional) The language type, e.g. the interface or the content language. + * Defaults to \Drupal\Core\Language\Language::TYPE_INTERFACE. * * @return \Drupal\Core\Language\Language * A language object for the given type. */ - public function getLanguage($type) { + public function getLanguage($type = Language::TYPE_INTERFACE) { if (isset($this->languages[$type])) { return $this->languages[$type]; }