--- ../../../drupal/modules/ecommerce/paypal/paypal.module	2005-12-26 01:31:16.000000000 -0600
+++ paypal/paypal.module	2006-02-28 14:16:25.000000000 -0600
@@ -109,11 +112,17 @@
     $txnid = 'txnid_'. $txn->txnid;
   }
 
-  global $base_url;
-  $return_url = variable_get('paypal_return_url', '%order-history') == '%order-history' ? t('%order-history', array('%order-history' => url("store/history/$user->uid"))) : url(variable_get('paypal_return_url', '%order-history'));
-  $return_url = $base_url .'/'. $return_url;
-  $cancel_url = (!strstr(variable_get('paypal_cancel_url', 'node'), 'http://')) ? $base_url. '/'. variable_get("paypal_cancel_url", 'node') : variable_get("paypal_cancel_url", 'node');
+  $return_url = (variable_get('paypal_return_url', '%order-history') == '%order-history') ?
+    t('%order-history', array(
+      '%order-history' => 
+      url("store/history/$user->uid",null,null,true)
+      )) :
+    url(variable_get('paypal_return_url', '%order-history'),null,null,true);
+  $cancel_url = (strpos(variable_get('paypal_cancel_url', 'node'), 'http') !== 0) ?
+    url(variable_get("paypal_cancel_url", 'node'), null, null, true) :
+    variable_get("paypal_cancel_url", 'node');
 
+  drupal_set_message( "here" . $return_url . " " . $cancel_url);
   $item_name = ($user->uid) ? t("%site_name order #%txn_id for %user_name", array('%site_name'=>variable_get('site_name', 'drupal'),'%txn_id'=>$txn->txnid,'%user_name'=>$user->name)): t("%site_name order #%txn_id",array('%site_name'=>variable_get("site_name", "drupal"),'%txn_id'=>$txn->txnid));
   $uri_array = array('business'       => variable_get('paypal_receiver_email', variable_get("site_mail", ini_get("sendmail_from"))),
                      'item_name'      => $item_name,