From 3c8c5102c34da6cdb46c99ddda8dcbc42892e676 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Mar 2018 23:34:05 +0100
Subject: [PATCH] Rename var to avoid conflicts

---
 htdocs/public/payment/newpayment.php |  4 ++--
 htdocs/public/stripe/newpayment.php  | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 3ad3f2d33fd..7230170e1aa 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1384,7 +1384,7 @@ if (preg_match('/^dopayment/',$action))
 		/*
 		print '<script src="https://checkout.stripe.com/checkout.js"
 		class="stripe-button"
-		data-key="'.$stripe['publishable_key'].'"
+		data-key="'.$stripearrayofkeys['publishable_key'].'"
 		data-amount="'.$ttc.'"
 		data-currency="'.$conf->currency.'"
 		data-description="'.$ref.'">
@@ -1469,7 +1469,7 @@ if (preg_match('/^dopayment/',$action))
 		?>
 
 	    // Create a Stripe client
-	    var stripe = Stripe('<?php echo $stripe['publishable_key']; ?>');
+	    var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
 
 	    // Create an instance of Elements
 	    var elements = stripe.elements();
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index ff1b03187c1..fc04ef87f1a 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -38,12 +38,10 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/stripe/config.php';
-/* included into config.php
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
-*/
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 // Security check
 if (empty($conf->stripe->enabled)) accessforbidden('',0,0,1);
@@ -1096,7 +1094,7 @@ if (preg_match('/^dopayment/',$action))
     /*
      print '<script src="https://checkout.stripe.com/checkout.js"
      class="stripe-button"
-     data-key="'.$stripe['publishable_key'].'"
+     data-key="'.$stripearrayofkeys['publishable_key'].'"
      data-amount="'.$ttc.'"
      data-currency="'.$conf->currency.'"
      data-description="'.$ref.'">
@@ -1182,7 +1180,7 @@ if (preg_match('/^dopayment/',$action))
     ?>
 
     // Create a Stripe client
-    var stripe = Stripe('<?php echo $stripe['publishable_key']; ?>');
+    var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; ?>');
 
     // Create an instance of Elements
     var elements = stripe.elements();