diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 3a54a49..24d43a7 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -2504,15 +2504,6 @@ function drupal_language_initialize() { ->addMethodCall('extend', array($default)); } } - - // @todo Temporary backwards compatibility for code still using globals. - // Remove after these issues: - // - $language_interface: http://drupal.org/node/1510686 - // - $language_url: http://drupal.org/node/1512310 - // - $language_content: http://drupal.org/node/1512308 - foreach ($types as $type) { - $GLOBALS[$type] = $container->get($type); - } } /** diff --git a/core/includes/common.inc b/core/includes/common.inc index 353a9b5..6800b1c 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -2128,8 +2128,8 @@ function _format_date_callback(array $matches = NULL, $new_langcode = NULL) { * - 'external': Whether the given path is an external URL. * - 'language': An optional language object. If the path being linked to is * internal to the site, $options['language'] is used to look up the alias - * for the URL. If $options['language'] is omitted, the global $language_url - * will be used. + * for the URL. If $options['language'] is omitted, the $language_url will + * be used. * - 'https': Whether this URL should point to a secure location. If not * defined, the current scheme is used, so the user stays on http or https * respectively. TRUE enforces HTTPS and FALSE enforces HTTP, but HTTPS can