Enable store switching with different url keys when store code is enabled

[magemonkey]

Suggested change line 252

$targetUrl = $request->getBaseUrl(). '/' . $this->getRequestPath();

to

if (Mage::getStoreConfig('web/url/use_store') && $storeCode = Mage::app()->getStore()->getCode()) {
$targetUrl = $request->getBaseUrl(). '/' . $storeCode . '/' .$this->getRequestPath();
} else {
$targetUrl = $request->getBaseUrl(). '/' . $this->getRequestPath();
}

[magemonkey]

You can close issue I submitted the change.