From 5b52cea97df8999e5a7415eadef1f1d821696071 Mon Sep 17 00:00:00 2001
From: Dries <dries@buytaert.net>
Date: Fri, 18 May 2012 16:42:40 -0400
Subject: [PATCH] - Patch #1539608 by cosmicdreams, Rob Loach: Modify comment
module to use Dependency Injection for language.
---
core/modules/comment/comment.module | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 5b42861c6bd1..58ea4a615500 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -949,7 +949,7 @@ function comment_prepare_thread(&$comments) {
*/
function comment_view(Comment $comment, Node $node, $view_mode = 'full', $langcode = NULL) {
if (!isset($langcode)) {
- $langcode = $GLOBALS['language_content']->langcode;
+ $langcode = drupal_container()->get(LANGUAGE_TYPE_CONTENT)->langcode;
}
// Populate $comment->content with a render() array.
@@ -1016,7 +1016,7 @@ function comment_view(Comment $comment, Node $node, $view_mode = 'full', $langco
*/
function comment_build_content(Comment $comment, Node $node, $view_mode = 'full', $langcode = NULL) {
if (!isset($langcode)) {
- $langcode = $GLOBALS['language_content']->langcode;
+ $langcode = drupal_container()->get(LANGUAGE_TYPE_CONTENT)->langcode;
}
// Remove previously built content, if exists.
--
GitLab