summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/profile.module6
-rw-r--r--modules/profile/profile.module6
-rw-r--r--modules/search.module6
-rw-r--r--modules/search/search.module6
-rw-r--r--modules/taxonomy.module7
-rw-r--r--modules/taxonomy/taxonomy.module7
6 files changed, 16 insertions, 22 deletions
diff --git a/modules/profile.module b/modules/profile.module
index 4b9401776..ea2279cf5 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -146,7 +146,7 @@ function profile_menu($may_cache) {
function profile_browse() {
$name = arg(1);
- $value = arg(2);
+ list(,,$value) = explode('/', $_GET['q'], 3);
$field = db_fetch_object(db_query("SELECT DISTINCT(fid), type, title, page, visibility FROM {profile_fields} WHERE name = '%s'", $name));
@@ -276,9 +276,9 @@ function profile_view_field($user, $field) {
case 'textarea':
return check_markup($value);
case 'selection':
- return $browse ? l($value, 'profile/'. drupal_urlencode($field->name) .'/'. drupal_urlencode($value)) : check_plain($value);
+ return $browse ? l($value, 'profile/'. $field->name .'/'. $value) : check_plain($value);
case 'checkbox':
- return $browse ? l($field->title, 'profile/'. drupal_urlencode($field->name)) : check_plain($field->title);
+ return $browse ? l($field->title, 'profile/'. $field->name) : check_plain($field->title);
case 'url':
return '<a href="'. check_url($value) .'">'. check_plain($value) .'</a>';
case 'date':
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index 4b9401776..ea2279cf5 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -146,7 +146,7 @@ function profile_menu($may_cache) {
function profile_browse() {
$name = arg(1);
- $value = arg(2);
+ list(,,$value) = explode('/', $_GET['q'], 3);
$field = db_fetch_object(db_query("SELECT DISTINCT(fid), type, title, page, visibility FROM {profile_fields} WHERE name = '%s'", $name));
@@ -276,9 +276,9 @@ function profile_view_field($user, $field) {
case 'textarea':
return check_markup($value);
case 'selection':
- return $browse ? l($value, 'profile/'. drupal_urlencode($field->name) .'/'. drupal_urlencode($value)) : check_plain($value);
+ return $browse ? l($value, 'profile/'. $field->name .'/'. $value) : check_plain($value);
case 'checkbox':
- return $browse ? l($field->title, 'profile/'. drupal_urlencode($field->name)) : check_plain($field->title);
+ return $browse ? l($field->title, 'profile/'. $field->name) : check_plain($field->title);
case 'url':
return '<a href="'. check_url($value) .'">'. check_plain($value) .'</a>';
case 'date':
diff --git a/modules/search.module b/modules/search.module
index 05cca24d1..1401e2420 100644
--- a/modules/search.module
+++ b/modules/search.module
@@ -165,7 +165,7 @@ function search_menu($may_cache) {
// To remember the user's search keywords when switching across tabs,
// we dynamically add the keywords to the search tabs' paths.
$keys = search_get_keys();
- $keys = strlen($keys) ? '/'. drupal_urlencode($keys) : '';
+ $keys = strlen($keys) ? '/'. $keys : '';
foreach (module_list() as $name) {
if (module_hook($name, 'search') && $title = module_invoke($name, 'search', 'name')) {
$items[] = array('path' => 'search/'. $name . $keys, 'title' => $title,
@@ -881,7 +881,7 @@ function search_view() {
$type = 'node';
}
$keys = module_invoke($type, 'search', 'post', $_POST['edit']['keys']);
- drupal_goto('search/'. drupal_urlencode($type) .'/'. drupal_urlencode(is_null($keys) ? $_POST['edit']['keys'] : $keys));
+ drupal_goto('search/'. $type .'/'. (is_null($keys) ? $_POST['edit']['keys'] : $keys));
}
else if ($type == '') {
// Note: search/node can not be a default tab because it would take on the
@@ -898,7 +898,7 @@ function search_view() {
watchdog('search',
t('Search: %keys (%type).', array('%keys' => theme('placeholder', $keys), '%type' => module_invoke($type, 'search', 'name'))),
WATCHDOG_NOTICE,
- l(t('results'), 'search/'. drupal_urlencode($type) .'/'. drupal_urlencode($keys))
+ l(t('results'), 'search/'. $type .'/'. $keys)
);
// Collect the search results:
diff --git a/modules/search/search.module b/modules/search/search.module
index 05cca24d1..1401e2420 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -165,7 +165,7 @@ function search_menu($may_cache) {
// To remember the user's search keywords when switching across tabs,
// we dynamically add the keywords to the search tabs' paths.
$keys = search_get_keys();
- $keys = strlen($keys) ? '/'. drupal_urlencode($keys) : '';
+ $keys = strlen($keys) ? '/'. $keys : '';
foreach (module_list() as $name) {
if (module_hook($name, 'search') && $title = module_invoke($name, 'search', 'name')) {
$items[] = array('path' => 'search/'. $name . $keys, 'title' => $title,
@@ -881,7 +881,7 @@ function search_view() {
$type = 'node';
}
$keys = module_invoke($type, 'search', 'post', $_POST['edit']['keys']);
- drupal_goto('search/'. drupal_urlencode($type) .'/'. drupal_urlencode(is_null($keys) ? $_POST['edit']['keys'] : $keys));
+ drupal_goto('search/'. $type .'/'. (is_null($keys) ? $_POST['edit']['keys'] : $keys));
}
else if ($type == '') {
// Note: search/node can not be a default tab because it would take on the
@@ -898,7 +898,7 @@ function search_view() {
watchdog('search',
t('Search: %keys (%type).', array('%keys' => theme('placeholder', $keys), '%type' => module_invoke($type, 'search', 'name'))),
WATCHDOG_NOTICE,
- l(t('results'), 'search/'. drupal_urlencode($type) .'/'. drupal_urlencode($keys))
+ l(t('results'), 'search/'. $type .'/'. $keys)
);
// Collect the search results:
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index 97a069488..10a593e3d 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -1044,9 +1044,6 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
drupal_not_found();
}
- // Needed for '+' to show up in RSS discovery URLs
- $rss_tids = urlencode($str_tids);
-
if ($tids) {
$result = db_query(db_rewrite_sql('SELECT t.tid, t.name FROM {term_data} t WHERE t.tid IN (%s)', 't', 'tid'), implode(',', $tids));
$tids = array(); // we rebuild the $tids-array so it only contains terms the user has access to.
@@ -1074,10 +1071,10 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
drupal_add_link(array('rel' => 'alternate',
'type' => 'application/rss+xml',
'title' => 'RSS - '. $title,
- 'href' => url('taxonomy/term/'. $rss_tids .'/'. $depth .'/feed')));
+ 'href' => url('taxonomy/term/'. $str_tids .'/'. $depth .'/feed')));
$output = taxonomy_render_nodes(taxonomy_select_nodes($tids, $operator, $depth, TRUE));
- $output .= theme('xml_icon', url("taxonomy/term/$rss_tids/$depth/feed"));
+ $output .= theme('xml_icon', url('taxonomy/term/'. $str_tids .'/'. $depth .'/feed'));
return $output;
break;
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 97a069488..10a593e3d 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -1044,9 +1044,6 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
drupal_not_found();
}
- // Needed for '+' to show up in RSS discovery URLs
- $rss_tids = urlencode($str_tids);
-
if ($tids) {
$result = db_query(db_rewrite_sql('SELECT t.tid, t.name FROM {term_data} t WHERE t.tid IN (%s)', 't', 'tid'), implode(',', $tids));
$tids = array(); // we rebuild the $tids-array so it only contains terms the user has access to.
@@ -1074,10 +1071,10 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
drupal_add_link(array('rel' => 'alternate',
'type' => 'application/rss+xml',
'title' => 'RSS - '. $title,
- 'href' => url('taxonomy/term/'. $rss_tids .'/'. $depth .'/feed')));
+ 'href' => url('taxonomy/term/'. $str_tids .'/'. $depth .'/feed')));
$output = taxonomy_render_nodes(taxonomy_select_nodes($tids, $operator, $depth, TRUE));
- $output .= theme('xml_icon', url("taxonomy/term/$rss_tids/$depth/feed"));
+ $output .= theme('xml_icon', url('taxonomy/term/'. $str_tids .'/'. $depth .'/feed'));
return $output;
break;