early adding a commit for 5.13 so that I can test interactions civicr…

…m/civicrm-core#13795
knieper · Apr 14, 2019 · 0418f70 · 0418f70
1 parent 32b7f6f
commit 0418f70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sites/all/modules/civicrm/CRM/Contribute/Form/Contribution/Main.php b/sites/all/modules/civicrm/CRM/Contribute/Form/Contribution/Main.php
@@ -897,7 +897,7 @@ public static function formRule($fields, $files, $self) {
     // return if this is express mode
     $config = CRM_Core_Config::singleton();
     if ($self->_paymentProcessor &&
-      $self->_paymentProcessor['billing_mode'] & CRM_Core_Payment::BILLING_MODE_BUTTON
+      /*$self->_paymentProcessor['billing_mode'] & CRM_Core_Payment::BILLING_MODE_BUTTON*/(int) $self->_paymentProcessor['billing_mode'] & CRM_Core_Payment::BILLING_MODE_BUTTON
     ) {
       if (!empty($fields[$self->_expressButtonName . '_x']) || !empty($fields[$self->_expressButtonName . '_y']) ||
         CRM_Utils_Array::value($self->_expressButtonName, $fields)

diff --git a/sites/all/modules/civicrm/CRM/Event/Form/Registration/Register.php b/sites/all/modules/civicrm/CRM/Event/Form/Registration/Register.php
@@ -1147,7 +1147,7 @@ public function postProcess() {
         $this->handlePreApproval($params);
       }
       elseif ($this->_paymentProcessor &&
-        $this->_paymentProcessor['billing_mode'] & CRM_Core_Payment::BILLING_MODE_NOTIFY
+        /*$this->_paymentProcessor['billing_mode'] & CRM_Core_Payment::BILLING_MODE_NOTIFY*/ (int) $this->_paymentProcessor['billing_mode'] & CRM_Core_Payment::BILLING_MODE_NOTIFY
       ) {
         // The concept of contributeMode is deprecated - but still needs removal from the message templates.
         $this->set('contributeMode', 'notify');