From ff639ed52c3dee80fe36e75e2330aaae1afdbd8c Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Wed, 6 Jun 2012 12:04:09 +0900
Subject: [PATCH] Revert "Issue #1464244 by dawehner, tim.plunkett: Fixed
Rewrite as URL adding equals sign to end of url."
This reverts commit e6986e5a48b1a021c1a1b797b8e7a79d618d924f.
---
core/includes/common.inc | 2 +-
core/modules/system/tests/common.test | 28 +--------------------------
2 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 48435518fd50..fa4c0c90c33c 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -451,7 +451,7 @@ function drupal_get_query_array($query) {
if (!empty($query)) {
foreach (explode('&', $query) as $param) {
$param = explode('=', $param);
- $result[$param[0]] = isset($param[1]) ? rawurldecode($param[1]) : NULL;
+ $result[$param[0]] = isset($param[1]) ? rawurldecode($param[1]) : '';
}
}
return $result;
diff --git a/core/modules/system/tests/common.test b/core/modules/system/tests/common.test
index 6a0b8a23d365..15286b6b8806 100644
--- a/core/modules/system/tests/common.test
+++ b/core/modules/system/tests/common.test
@@ -76,7 +76,7 @@ class CommonDrupalAlterTestCase extends WebTestBase {
* url() calls module_implements(), which may issue a db query, which requires
* inheriting from a web test case rather than a unit test case.
*/
-class CommonURLWebTestCase extends WebTestBase {
+class CommonURLUnitTestCase extends WebTestBase {
public static function getInfo() {
return array(
'name' => 'URL generation tests',
@@ -280,32 +280,6 @@ class CommonURLWebTestCase extends WebTestBase {
}
}
-/**
- * Tests for non-DB based URL generation functions.
- */
-class CommonUrlUnitTestCase extends UnitTestBase {
-
- public static function getInfo() {
- return array(
- 'name' => 'URL generation tests',
- 'description' => 'Confirm that drupal_get_query_array() works correctly with various input.',
- 'group' => 'Common',
- );
- }
-
- /**
- * Tests drupal_get_query_array().
- */
- function testDrupalGetQueryArray() {
- $this->assertEqual(drupal_get_query_array('foo=bar'), array('foo' => 'bar'), 'Simple value works as expected.');
- $this->assertEqual(drupal_get_query_array('foo=1'), array('foo' => '1'), 'Numeric value works as expected.');
- $this->assertEqual(drupal_get_query_array('foo=1&bar=baz'), array('foo' => '1', 'bar' => 'baz'), 'Multiple values are parsed as well.');
- $this->assertEqual(drupal_get_query_array('foo='), array('foo' => ''), 'An empty value is set as an empty string.');
- $this->assertEqual(drupal_get_query_array('foo'), array('foo' => NULL), 'No value is set as a null value.');
- }
-
-}
-
/**
* Tests for check_plain(), filter_xss(), format_string(), and check_url().
*/
--
GitLab