diff options
| -rw-r--r-- | includes/common.inc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc index 3a13bdba6..79a1d8286 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1284,11 +1284,25 @@ function drupal_to_js($var) { * are urlencoded() when passed through url() and do not require urlencoding() * of individual components. * + * Notes: + * - For esthetic reasons, we do not escape slashes. This also avoids a 'feature' + * in Apache where it 404s on any path containing '%2F'. + * - mod_rewrite's unescapes %-encoded ampersands and hashes when clean URLs + * are used, which are interpreted as delimiters by PHP. These characters are + * double escaped so PHP will still see the encoded version. + * * @param $text * String to encode */ function drupal_urlencode($text) { - return str_replace('%2F', '/', urlencode($text)); + if (variable_get('clean_url', '0')) { + return str_replace(array('%2F', '%26', '%23'), + array('/', '%2526', '%2523'), + urlencode($text)); + } + else { + return str_replace('%2F', '/', urlencode($text)); + } } /** |