Merge branch 'xorg/maint' into xorg/master

diff --combined modules/payment/money/paypal.inc.php
index aba2f9a,41fbb6c..3ea2c63
--- 1/modules/payment/money/paypal.inc.php
--- 2/modules/payment/money/paypal.inc.php
+++ b/modules/payment/money/paypal.inc.php
@@@ -33,7 -33,7 +33,7 @@@ class PayPa
          $this->val_number = $val;
      }
  
 -    function prepareform($pay)
 +    function prepareform($pay, $user)
      {
          // Documentation:
          // https://www.paypal.com/developer
@@@ -43,10 -43,11 +43,10 @@@
          global $globals, $platal;
  
          $this->urlform = 'https://' . $globals->money->paypal_site . '/cgi-bin/webscr';
 -        $user = S::user();
  
          $roboturl = str_replace("https://","http://",$globals->baseurl)
                    . '/' . $platal->ns . "payment/paypal_return/" . S::v('uid')
-                   . "?comment=" . urlencode(Env::v('comment')) . '?display=' . Post::i('display');
+                   . "?comment=" . urlencode(Env::v('comment')) . '&display=' . Post::i('display');
  
          $this->infos = array(
              'commercant' => array(