Overlay redirect does not include query string

Problem/Motivation

When a user attempts to view a non-administrative page in overlay, they are typically redirected to the same page without overlay. However, if the path includes a query string (e.g. ?page=1), the query string is incorrectly discarded and the user is redirected to the base path only. This is because of the following code in overlay_init(), which does not include the query string:

      // If this page shouldn't be rendered here, redirect to the parent.
      if (!path_is_admin($current_path)) {
        overlay_close_dialog($current_path);
      }

Proposed resolution

Add the current query string to the redirection path, if any. Patch #1146234-1: Overlay redirect does not include query string implements this change.

Remaining tasks

None. The patch is a straightforward bug fix and the overlay maintainer has signed off on the change.

User interface changes

If the user attempts to open a non-admin page in overlay, they will be correctly redirected to the same page, rather than the base path of that page.

API changes

None.

Original report by @jtwalters

The following code in overlay.module does not take into consideration any query string parameters in the current path.

      // If this page shouldn't be rendered here, redirect to the parent.
      if (!path_is_admin($current_path)) {
        overlay_close_dialog($current_path);
      }

If the redirect destination includes a query string, such as when using a pager (e.g. ?page=1), the overlay module incorrectly redirects without the page in the query string.

I would expect the redirect to include any existing query string parameters.