diff options
author | webchick <webchick@24967.no-reply.drupal.org> | 2013-12-03 10:57:07 -0800 |
---|---|---|
committer | webchick <webchick@24967.no-reply.drupal.org> | 2013-12-03 10:57:18 -0800 |
commit | a38172dc202deaa622ed8ccc255ce7cdf0bcb39a (patch) | |
tree | 057a8b32b44fe09d48c3fd4b774a5fb3ae63190a /core/includes/language.inc | |
parent | 936662b6ca173004d4bc9903e5c8015068a550a2 (diff) | |
download | drupal-a38172dc202deaa622ed8ccc255ce7cdf0bcb39a.tar.gz drupal-a38172dc202deaa622ed8ccc255ce7cdf0bcb39a.zip |
Issue #1998638 by damiankloip, dawehner, kim.pepper, cosmicdreams, larowlan, Damien Tournoud: Replace all remaining superglobals (, , etc.) with Symfony Request object.
Diffstat (limited to 'core/includes/language.inc')
-rw-r--r-- | core/includes/language.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/includes/language.inc b/core/includes/language.inc index 07cc38354215..618e3a700280 100644 --- a/core/includes/language.inc +++ b/core/includes/language.inc @@ -100,7 +100,8 @@ const LANGUAGE_NEGOTIATION_INTERFACE = 'language-interface'; * $langcode = language_from_url($languages); * * // If we are on an administrative path, override with the default language. - * if (isset($_GET['q']) && strtok($_GET['q'], '/') == 'admin') { + * $query = \Drupal::request()->query; + * if ($query->has('q') && strtok($query->get('q'), '/') == 'admin') { * return language_default()->id; * } * return $langcode; |