diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/profile.module | 6 | ||||
| -rw-r--r-- | modules/profile/profile.module | 6 | ||||
| -rw-r--r-- | modules/search.module | 4 | ||||
| -rw-r--r-- | modules/search/search.module | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/modules/profile.module b/modules/profile.module index 993d70f56..bd6c7cde8 100644 --- a/modules/profile.module +++ b/modules/profile.module @@ -252,9 +252,9 @@ function profile_view_field($user, $field) { case 'textarea': return check_markup($value); case 'selection': - return $browse ? l($value, "profile/$field->name/$value") : check_plain($value); + return $browse ? l($value, 'profile/'. drupal_urlencode($field->name) .'/'. drupal_urlencode($value)) : check_plain($value); case 'checkbox': - return $browse ? l($field->title, "profile/$field->name") : check_plain($field->title); + return $browse ? l($field->title, 'profile/'. drupal_urlencode($field->name)) : check_plain($field->title); case 'url': return '<a href="'. check_url($value) .'">'. check_plain($value) .'</a>'; case 'date': @@ -273,7 +273,7 @@ function profile_view_field($user, $field) { $fields = array(); foreach ($values as $value) { if ($value = trim($value)) { - $fields[] = $browse ? l($value, "profile/". urlencode($field->name) ."/". urlencode($value)) : check_plain($value); + $fields[] = $browse ? l($value, "profile/". drupal_urlencode($field->name) ."/". drupal_urlencode($value)) : check_plain($value); } } return implode(', ', $fields); diff --git a/modules/profile/profile.module b/modules/profile/profile.module index 993d70f56..bd6c7cde8 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -252,9 +252,9 @@ function profile_view_field($user, $field) { case 'textarea': return check_markup($value); case 'selection': - return $browse ? l($value, "profile/$field->name/$value") : check_plain($value); + return $browse ? l($value, 'profile/'. drupal_urlencode($field->name) .'/'. drupal_urlencode($value)) : check_plain($value); case 'checkbox': - return $browse ? l($field->title, "profile/$field->name") : check_plain($field->title); + return $browse ? l($field->title, 'profile/'. drupal_urlencode($field->name)) : check_plain($field->title); case 'url': return '<a href="'. check_url($value) .'">'. check_plain($value) .'</a>'; case 'date': @@ -273,7 +273,7 @@ function profile_view_field($user, $field) { $fields = array(); foreach ($values as $value) { if ($value = trim($value)) { - $fields[] = $browse ? l($value, "profile/". urlencode($field->name) ."/". urlencode($value)) : check_plain($value); + $fields[] = $browse ? l($value, "profile/". drupal_urlencode($field->name) ."/". drupal_urlencode($value)) : check_plain($value); } } return implode(', ', $fields); diff --git a/modules/search.module b/modules/search.module index e26f7045e..54c656e0f 100644 --- a/modules/search.module +++ b/modules/search.module @@ -811,7 +811,7 @@ function search_view() { $type = 'node'; } $keys = module_invoke($type, 'search', 'post', $_POST['edit']['keys']); - drupal_goto('search/'. urlencode($type) .'/'. urlencode(is_null($keys) ? $_POST['edit']['keys'] : $keys)); + drupal_goto('search/'. drupal_urlencode($type) .'/'. drupal_urlencode(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 @@ -828,7 +828,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/'. urlencode($type) .'/'. urlencode($keys)) + l(t('results'), 'search/'. drupal_urlencode($type) .'/'. drupal_urlencode($keys)) ); // Collect the search results: diff --git a/modules/search/search.module b/modules/search/search.module index e26f7045e..54c656e0f 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -811,7 +811,7 @@ function search_view() { $type = 'node'; } $keys = module_invoke($type, 'search', 'post', $_POST['edit']['keys']); - drupal_goto('search/'. urlencode($type) .'/'. urlencode(is_null($keys) ? $_POST['edit']['keys'] : $keys)); + drupal_goto('search/'. drupal_urlencode($type) .'/'. drupal_urlencode(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 @@ -828,7 +828,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/'. urlencode($type) .'/'. urlencode($keys)) + l(t('results'), 'search/'. drupal_urlencode($type) .'/'. drupal_urlencode($keys)) ); // Collect the search results: |