Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.429
diff -u -F^f -r1.429 common.inc
--- includes/common.inc	6 Mar 2005 06:57:58 -0000	1.429
+++ includes/common.inc	13 Mar 2005 22:35:46 -0000
@@ -1481,10 +1481,10 @@ function url($path = NULL, $query = NULL
   if (variable_get('clean_url', '0') == '0') {
     if (isset($path)) {
       if (isset($query)) {
-        return $base . $script .'?q='. $path .'&'. $query . $fragment;
+        return (valid_url($path, TRUE) ? $path .'&'. $query . $fragment : $base . $script .'?q='. $path .'&'. $query . $fragment);
       }
       else {
-        return $base . $script .'?q='. $path . $fragment;
+        return (valid_url($path, TRUE) ? $path . $fragment : $base . $script .'?q='. $path . $fragment);
       }
     }
     else {