backport bugfix paiement

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@223 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/htdocs/index.php b/htdocs/index.php
index 4855883..3d6c6cd 100644 (file)
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -18,7 +18,6 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
-
 require_once("xorg.inc.php");
 new_skinned_page('index.tpl', AUTH_PUBLIC);
 if (logged()) {

diff --git a/htdocs/paiement/index.php b/htdocs/paiement/index.php
index 813f1a7..8dde362 100644 (file)
--- a/htdocs/paiement/index.php
+++ b/htdocs/paiement/index.php
@@ -34,7 +34,7 @@ if($pay->flags->hasflag('old')){
     $page->trig("La transaction selectionnée est périmée.");
     $pay = new Payment();
 }
-$val  = (Env::has('montant')) ? Env::get('montant') : $pay->montant_def;
+$val  = (Env::has('montant') && !Env::has('ref')) ? Env::get('montant') : $pay->montant_def;
 
 if (($e = $pay->check($val)) !== true) {
     $page->trig($e);

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index 95a7bb9..43dc4f6 100644 (file)
--- a/include/xorg.inc.php
+++ b/include/xorg.inc.php
@@ -18,7 +18,6 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
-
 require_once('platal.inc.php');
 require_once('xorg/globals.inc.php');
 require_once('xorg/session.inc.php');