Incorrect Form Action in Block Display

First off, great module, this is exactly what we needed for our client, so thanks bojanz.

Summary of Problem

I needed to have an order form on the product page that shows each product variation on it's own line with a quantity field and an add to cart button. To start, I created a page display view to test things out which I got working correctly. I was able to add any number of any product variation to the cart using the page display of the view. I was redirected to the same page (as expected) and was shown the add to cart confirmation popup.

I then created a block display so I can have this order form on the individual product pages. To limit the product variations to only those related to the product being viewed, I created a contextual filter of the Nid and provided a default value (since this is a block display, there is no source for contextual filters) of "Content ID from URL".

The block displays correctly, however, the form action is incorrect, instead of using the aliased URL of the current page as I would expect, the form action was set to "/node/nid/nid". When the add to cart button was clicked, the page refreshed, and I was brought to the product page at "/node/nid/nid" instead of the aliased version of the page that I clicked "Add To Cart" on. I was not shown the add to cart confirmation popup, and my cart is empty. I have attached the view export if it would be helpful to see.

Proposed Solution

I searched through the issue queue and identified this patch that enables the block display, and the use of views_embed_view. While looking at the code I was able to identify the following line as the issue:

$form['#action'] = url($view->get_url(), array('query' => $query));

Which updates the form action by using the views method get_url and appending any query string parameters if they were present. The problem is that the $view->get_url() is returning the above mentioned url ("/node/nid/nid").

The fix for me was to use the request_uri() function to get the aliased URL for the page current being viewed. I switched the above line with this:

$form['#action'] = url(trim(request_uri(),'/'), array('query' => $query));

I am using trim to remove the leading (and trailing if present) slash. Once this switch was made, my block display view began working correctly. I am not sure if there are any unknown effects of using the request_uri instead of the $view->get_url().

EDIT: The above does not work correctly when there are special characters in the URL, so I have switched to using

$form_action = drupal_get_destination();
$form['#action'] = url($form_action['destination'],array('query'=> $query,'html' => TRUE));

The above returns the correct path "node/nid".

To Do

For my purposes this appears to work just fine, I will be playing around with it some more over the next couple of days and will update if I find any issues with the switch.