Merge pull request #152 from laryn/patch-2

Same syntax error on 4.7

CRM/Core/Payment/Stripe.php

@@ -605,7 +605,7 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
 
     $existing_subscription_query = CRM_Core_DAO::singleValueQuery("SELECT invoice_id
       FROM civicrm_stripe_subscriptions
-      WHERE customer_id = %1 AND is_live = '{$this->_islive}', and processor_id = %2", $query_params);
+      WHERE customer_id = %1 AND is_live = '{$this->_islive}' AND processor_id = %2", $query_params);
 
     if (!empty($existing_subscription_query)) {
       // Cancel existing Recurring Contribution in CiviCRM.
@@ -634,7 +634,7 @@ class CRM_Core_Payment_Stripe extends CRM_Core_Payment {
     $query_params = array(
       1 => array($stripe_customer->id, 'String'),
       2 => array($invoice_id, 'String'),
-      2 => array($this->_paymentProcessor['id'], 'Integer'),
+      3 => array($this->_paymentProcessor['id'], 'Integer'),
     );
 
     // Insert the new Stripe Subscription info.