--- ../ezpublish-3.10.0/kernel/shop/basket.php  2007-10-03 16:05:34.000000000 +0200
+++ kernel/shop/basket.php      2007-12-04 17:27:36.000000000 +0100
@@ -38,6 +38,7 @@
 include_once( "kernel/classes/ezproductcollectionitemoption.php" );
 include_once( "kernel/common/template.php" );
 include_once( 'lib/ezutils/classes/ezhttptool.php' );
+include_once( 'lib/ezutils/classes/ezuri.php' );
 
 $basket =& eZBasket::currentBasket();
 $basket->updatePrices(); // Update the prices. Transaction not necessary.
@@ -52,7 +53,7 @@
     else
         $optionList = array();
 
-    $http->setSessionVariable( "FromPage", $_SERVER['HTTP_REFERER'] );
+    $http->setSessionVariable( "FromPage", eZURI::decodeURL( $_SERVER['HTTP_REFERER'] ) );
     $http->setSessionVariable( "AddToBasket_OptionList_" . $objectID, $optionList );
 
     $module->redirectTo( "/shop/add/" . $objectID );