Merge pull request #15237 from civicrm/5.18

5.18
civicrm · Sep 7, 2019 · 8d6badf · 8d6badf
2 parents 5e33479 + a2106c8
commit 8d6badf
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 8 deletions.
diff --git a/CRM/Campaign/Form/Campaign.php b/CRM/Campaign/Form/Campaign.php
@@ -165,6 +165,7 @@ public function setDefaultValues() {
   }
 
   public function buildQuickForm() {
+    $this->add('hidden', 'id', $this->_campaignId);
     if ($this->_action & CRM_Core_Action::DELETE) {
 
       $this->addButtons([
@@ -186,7 +187,6 @@ public function buildQuickForm() {
     //lets assign custom data type and subtype.
     $this->assign('customDataType', 'Campaign');
     $this->assign('entityID', $this->_campaignId);
-    $this->assign('id', $this->_campaignId);
     $this->assign('customDataSubType', CRM_Utils_Array::value('campaign_type_id', $this->_values));
 
     $attributes = CRM_Core_DAO::getAttribute('CRM_Campaign_DAO_Campaign');
@@ -292,14 +292,18 @@ public function postProcess() {
 
     $session = CRM_Core_Session::singleton();
     $params = $this->controller->exportValues($this->_name);
-    if (isset($this->_campaignId)) {
+    // To properly save the DAO we need to ensure we don't have a blank id key passed through.
+    if (empty($params['id'])) {
+      unset($params['id']);
+    }
+    if (!empty($params['id'])) {
       if ($this->_action & CRM_Core_Action::DELETE) {
-        CRM_Campaign_BAO_Campaign::del($this->_campaignId);
+        CRM_Campaign_BAO_Campaign::del($params['id']);
         CRM_Core_Session::setStatus(ts('Campaign has been deleted.'), ts('Record Deleted'), 'success');
         $session->replaceUserContext(CRM_Utils_System::url('civicrm/campaign', 'reset=1&subPage=campaign'));
         return;
       }
-      $params['id'] = $this->_campaignId;
+      $this->_campaignId = $params['id'];
     }
     else {
       $params['created_id'] = $session->get('userID');
@@ -328,7 +332,7 @@ public function postProcess() {
 
   public static function submit($params = [], $form) {
     $groups = [];
-    if (is_array($params['includeGroups'])) {
+    if (!empty($params['includeGroups']) && is_array($params['includeGroups'])) {
       foreach ($params['includeGroups'] as $key => $id) {
         if ($id) {
           $groups['include'][] = $id;
@@ -355,6 +359,7 @@ public static function submit($params = [], $form) {
       $form->_campaignId,
       'Campaign'
     );
+
     // dev/core#1067 Clean Money before passing onto BAO to do the create.
     $params['goal_revenue'] = CRM_Utils_Rule::cleanMoney($params['goal_revenue']);
     $result = civicrm_api3('Campaign', 'create', $params);

diff --git a/CRM/Grant/Form/Grant.php b/CRM/Grant/Form/Grant.php
@@ -142,6 +142,11 @@ public function setDefaultValues() {
         $defaults['amount_granted'] = CRM_Utils_Money::format($defaults['amount_granted'], NULL, '%a');
       }
     }
+    else {
+      if ($this->_contactID) {
+        $defaults['contact_id'] = $this->_contactID;
+      }
+    }
 
     return $defaults;
   }

diff --git a/CRM/Import/ImportProcessor.php b/CRM/Import/ImportProcessor.php
@@ -112,8 +112,8 @@ public function getContactSubType(): string {
    *
    * @param string $contactSubType
    */
-  public function setContactSubType(string $contactSubType) {
-    $this->contactSubType = $contactSubType;
+  public function setContactSubType($contactSubType) {
+    $this->contactSubType = (string) $contactSubType;
   }
 
   /**

diff --git a/CRM/Utils/API/HTMLInputCoder.php b/CRM/Utils/API/HTMLInputCoder.php
@@ -119,6 +119,8 @@ public function getSkipFields() {
         'operator',
         // CRM-20468
         'content',
+        // CiviCampaign Goal Details
+        'goal_general',
       ];
       $custom = CRM_Core_DAO::executeQuery('SELECT id FROM civicrm_custom_field WHERE html_type = "RichTextEditor"');
       while ($custom->fetch()) {

diff --git a/tests/phpunit/CRM/Campaign/Form/CampaignTest.php b/tests/phpunit/CRM/Campaign/Form/CampaignTest.php
@@ -55,7 +55,6 @@ public function testSubmit($thousandSeparator) {
       'custom' => [],
       'campaign_type_id' => 1,
     ], $form);
-    var_dump($form);
     $campaign = $this->callAPISuccess('campaign', 'get', ['id' => $result['id']]);
     $this->assertEquals('10000', $campaign['values'][$campaign['id']]['goal_revenue']);
   }

diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php
@@ -583,6 +583,15 @@ public static function toBeSkipped_getSqlOperators() {
       //a bit of a pseudoapi - keys by domain
       'Setting',
     ];
+
+    // The testSqlOperators fails sporadically on MySQL 5.5, which is deprecated anyway.
+    // Test data providers should be able to run in pre-boot environment, so we connect directly to SQL server.
+    require_once 'DB.php';
+    $db = DB::connect(CIVICRM_DSN);
+    if ($db->connection instanceof mysqli && $db->connection->server_version < 50600) {
+      $entitiesWithout[] = 'Dedupe';
+    }
+
     return $entitiesWithout;
   }