drupal_goto() and url() encode query string

This is probably related to #1331832: Correct handling of Query strings and fragments(anchors), and I'm not sure why it looked like it was working before, but it looks like any time a query string is entered using the link module, adding it back onto $path on line 127 of field_redirection.module just ends up making the whole thing encoded.

As far as I can see, the query string options are supposed to be passed in as another array in drupal_goto() and url(). The docs say it should work for external links, but it seems to be mangling internal links.

I removed the code adding the query onto the path, and just passed it into url() and drupal_goto() and that seems to have fixed it.

Could I have a couple more eyes to see if this is all still right?