From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 18 Aug 2020 03:26:48 +0000 (+1000)
Subject: Merge in 5.29
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=49d47ca8bc67cc07c5622f731366a6e01b4a3803;p=civicrm-core.git

Merge in 5.29
---

49d47ca8bc67cc07c5622f731366a6e01b4a3803
diff --cc CRM/Case/Form/CaseView.php
index f2300dadb2,646d48cfd0..7c9724a53c
--- a/CRM/Case/Form/CaseView.php
+++ b/CRM/Case/Form/CaseView.php
@@@ -272,13 -272,7 +272,10 @@@ class CRM_Case_Form_CaseView extends CR
          ['class' => 'crm-select2 crm-action-menu fa-list-ol']
        );
      }
 +    // This button is hidden but gets clicked by javascript at
 +    // https://github.com/civicrm/civicrm-core/blob/bd28ecf8121a85bc069cad3ab912a0c3dff8fdc5/templates/CRM/Case/Form/CaseView.js#L194
 +    // by the onChange handler for the above timeline_id select.
-     $this->addElement('xbutton', $this->getButtonName('next'), ' ', [
-       'class' => 'hiddenElement',
-       'type' => 'submit',
-     ]);
+     $this->addElement('submit', $this->getButtonName('next'), ' ', ['class' => 'hiddenElement']);
  
      $this->buildMergeCaseForm();
  
@@@ -523,10 -517,7 +520,10 @@@
          FALSE,
          ['class' => 'crm-select2 huge']
        );
 +      // This button is hidden but gets clicked by javascript at
 +      // https://github.com/civicrm/civicrm-core/blob/bd28ecf8121a85bc069cad3ab912a0c3dff8fdc5/templates/CRM/Case/Form/CaseView.js#L55
 +      // when the mergeCasesDialog is saved.
-       $this->addElement('xbutton',
+       $this->addElement('submit',
          $this->getButtonName('next', 'merge_case'),
          ts('Merge'),
          [