Merge branch 'xorg/1.0.2/master' into xorg/master

diff --cc ChangeLog
Simple merge

diff --cc modules/payment.php
index 23f0b8d,543eba1..c07a95c
--- 1/modules/payment.php
--- 2/modules/payment.php
+++ b/modules/payment.php
@@@ -164,24 -164,23 +164,25 @@@ class PaymentModule extends PLModul
              $pay->init($val, $meth);
              $pay->prepareform($pay);
          } else {
 -            $res = XDB::iterator("SELECT  timestamp, amount
 +            $res = XDB::iterator('SELECT  timestamp, amount
                                      FROM  payment_transactions
                                     WHERE  uid = {?} AND ref = {?}
 -                                ORDER BY  timestamp DESC",
 +                                ORDER BY  timestamp DESC',
                                   S::v('uid', -1), $ref);
  
 -            if ($res->total()) $page->assign('transactions', $res);
 +            if ($res->total()) {
 +                $page->assign('transactions', $res);
 +            }
          }
  
 -        $val = floor($val).".".substr(floor(($val - floor($val))*100+100),1);
 -        $page->assign('montant',$val);
 -        $page->assign('comment',Env::v('comment'));
 +        $val = floor($val) . '.' . substr(floor(($val - floor($val)) * 100 + 100), 1);
 +        $page->assign('montant', $val);
 +        $page->assign('comment', Env::v('comment'));
  
          $page->assign('meth', $meth);
 -        $page->assign('pay',  $pay);
 +        $page->assign('pay', $pay);
          $page->assign('evtlink', $pay->event());
+         $page->assign('sex', S::user()->isFemale());
      }
  
      function handler_cyber_return(&$page, $uid = null)