From 9dee6f6128cbc15515ae80876d624838be53a4af Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Tue, 15 May 2012 21:37:07 +0900
Subject: [PATCH] Issue #1539626 by cosmicdreams: Modify node module to use
dependency injection for language.
---
core/modules/node/node.module | 2 +-
core/modules/node/node.test | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 8dbc060edbdf..64491939e08d 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -687,7 +687,7 @@ function node_type_update_nodes($old_type, $type) {
* type object by $type->disabled being set to TRUE.
*/
function _node_types_build($rebuild = FALSE) {
- $cid = 'node_types:' . $GLOBALS['language_interface']->langcode;
+ $cid = 'node_types:' . drupal_container()->get(LANGUAGE_TYPE_INTERFACE)->langcode;
if (!$rebuild) {
$_node_types = &drupal_static(__FUNCTION__);
diff --git a/core/modules/node/node.test b/core/modules/node/node.test
index deccadaa3e88..9188bad01421 100644
--- a/core/modules/node/node.test
+++ b/core/modules/node/node.test
@@ -2278,7 +2278,7 @@ class NodeTokenReplaceTestCase extends NodeWebTestCase {
* Creates a node, then tests the tokens generated from it.
*/
function testNodeTokenReplacement() {
- global $language_interface;
+ $language_interface = drupal_container()->get(LANGUAGE_TYPE_INTERFACE);
$url_options = array(
'absolute' => TRUE,
'language' => $language_interface,
--
GitLab