[gh-283] Merging from testing into staging -c 1407,1409

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@1412 20a16fea-79d4-4915-8869-1ea9d5ebf173

sites/all/modules/unl/unl.module

@@ -1026,7 +1026,7 @@ function unl_init() {
     $primary_base_url = $current_url_schema . substr($primary_base_url, strlen($primary_base_url_schema));
 
     if (conf_path() != 'sites/default' && $primary_base_url != url() && PHP_SAPI != 'cli') {
-      drupal_goto($primary_base_url . current_path());
+      drupal_goto(url($primary_base_url . request_path(), array('query' => drupal_get_query_parameters())));
     }
   }