Commit ff639ed5 authored by catch's avatar catch

Revert "Issue #1464244 by dawehner, tim.plunkett: Fixed Rewrite as URL adding...

Revert "Issue #1464244 by dawehner, tim.plunkett: Fixed Rewrite as URL adding equals sign to end of url."

This reverts commit e6986e5a.
parent 33e8b1b5
......@@ -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;
......
......@@ -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().
*/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment