diff --git a/core/modules/language/language.negotiation.inc b/core/modules/language/language.negotiation.inc index dc69597..c847678 100644 --- a/core/modules/language/language.negotiation.inc +++ b/core/modules/language/language.negotiation.inc @@ -135,7 +135,6 @@ function language_from_browser($languages) { // first occurence of '-' otherwise we get a non-existing language zh. // All other languages use a langcode without a '-', so we can safely split // on the first occurence of it. - $generic_tag = ''; if (strlen($langcode) > 7 && (substr($langcode, 0, 7) == 'zh-hant' || substr($langcode, 0, 7) == 'zh-hans')) { $generic_tag = substr($langcode, 0, 7); } @@ -293,7 +292,7 @@ function language_from_url($languages, Request $request = NULL) { case LANGUAGE_NEGOTIATION_URL_PREFIX: $request_path = urldecode(trim($request->getPathInfo(), '/')); - list($language, $path) = language_url_split_prefix($request_path, $languages); + list($language, ) = language_url_split_prefix($request_path, $languages); if ($language !== FALSE) { $language_url = $language->id; diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php index f970bdd..8aa5506 100644 --- a/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php +++ b/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php @@ -34,8 +34,6 @@ public static function getInfo() { * Functional tests for adding, editing and deleting languages. */ function testLanguageConfiguration() { - global $base_url; - // User to add and remove language. $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'administer site configuration')); $this->drupalLogin($admin_user); diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageCustomLanguageConfigurationTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageCustomLanguageConfigurationTest.php index ff8086b..0196b19 100644 --- a/core/modules/language/lib/Drupal/language/Tests/LanguageCustomLanguageConfigurationTest.php +++ b/core/modules/language/lib/Drupal/language/Tests/LanguageCustomLanguageConfigurationTest.php @@ -34,8 +34,6 @@ public static function getInfo() { * Functional tests for adding, editing and deleting languages. */ public function testLanguageConfiguration() { - global $base_url; - // Create user with permissions to add and remove languages. $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages')); $this->drupalLogin($admin_user); diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageListTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageListTest.php index 4870f57..43049e8 100644 --- a/core/modules/language/lib/Drupal/language/Tests/LanguageListTest.php +++ b/core/modules/language/lib/Drupal/language/Tests/LanguageListTest.php @@ -34,8 +34,6 @@ public static function getInfo() { * Functional tests for adding, editing and deleting languages. */ function testLanguageList() { - global $base_url; - // User to add and remove language. $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'administer site configuration')); $this->drupalLogin($admin_user); diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageUrlRewritingTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageUrlRewritingTest.php index 5266fd1..7a1418d 100644 --- a/core/modules/language/lib/Drupal/language/Tests/LanguageUrlRewritingTest.php +++ b/core/modules/language/lib/Drupal/language/Tests/LanguageUrlRewritingTest.php @@ -59,7 +59,6 @@ function testUrlRewritingEdgeCases() { $non_existing->id = $this->randomName(); $this->checkUrl($non_existing, 'Path language is ignored if language is not installed.', 'URL language negotiation does not work with non-installed languages'); - $request = $this->prepareRequestForGenerator(); // Check that URL rewriting is not applied to subrequests. $this->drupalGet('language_test/subrequest'); $this->assertText($this->web_user->getUsername(), 'Page correctly retrieved');