Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.542
diff -u -F^f -r1.542 common.inc
--- includes/common.inc	8 Jun 2006 21:23:40 -0000	1.542
+++ includes/common.inc	13 Jun 2006 22:17:13 -0000
@@ -1288,7 +1288,13 @@ function drupal_to_js($var) {
  *   String to encode
  */
 function drupal_urlencode($text) {
-  return str_replace('%2F', '/', urlencode($text));
+  $text = str_replace('%2F', '/', urlencode($text));
+  if ((bool)variable_get('clean_url', '0') == TRUE) {
+    // Double escape ampersands when using clean URLs to counteract the extra
+    // escaping in mod_rewrite.
+    $text = str_replace('%26', '%2526', $text);
+  }
+  return $text;
 }
 
 /**