Merge pull request #12792 from civicrm/5.5

5.5

diff --git a/CRM/Custom/Form/Field.php b/CRM/Custom/Form/Field.php
index 4391c22ee3e344dc5301ca86998d3c17708d6fa0..518bd0d7b4e3c411962dc5c8312fd4bc2a098095 100644 (file)
--- a/CRM/Custom/Form/Field.php
+++ b/CRM/Custom/Form/Field.php
@@ -324,10 +324,12 @@ class CRM_Custom_Form_Field extends CRM_Core_Form {
 
     if ($this->_action == CRM_Core_Action::UPDATE) {
       $this->freeze('data_type');
-      // Before dev/core#155 we didn't set the is_reserved flag properly, which should be handled by the upgrade script...
-      //  but it is still possible that existing installs may have optiongroups linked to custom fields that are marked reserved.
-      $optionGroupParams['id'] = $this->_values['option_group_id'];
-      $optionGroupParams['options']['or'] = [["is_reserved", "id"]];
+      if (!empty($this->_values['option_group_id'])) {
+        // Before dev/core#155 we didn't set the is_reserved flag properly, which should be handled by the upgrade script...
+        //  but it is still possible that existing installs may have optiongroups linked to custom fields that are marked reserved.
+        $optionGroupParams['id'] = $this->_values['option_group_id'];
+        $optionGroupParams['options']['or'] = [["is_reserved", "id"]];
+      }
     }
 
     // Retrieve optiongroups for selection list

diff --git a/distmaker/dists/backdrop_php5.sh b/distmaker/dists/backdrop_php5.sh
index 4288253c8f4ce3a72e17d6deb00efc6fb20bf182..2987c9d27dafbe5c9dfccc4f003c8c4c0dcc27bd 100644 (file)
--- a/distmaker/dists/backdrop_php5.sh
+++ b/distmaker/dists/backdrop_php5.sh
@@ -23,6 +23,7 @@ dm_install_packages "$SRC/packages" "$TRG/packages"
 dm_install_vendor "$SRC/vendor" "$TRG/vendor"
 dm_install_bower "$SRC/bower_components" "$TRG/bower_components"
 dm_install_drupal "$SRC/backdrop" "$TRG/backdrop"
+dm_install_cvext org.civicrm.api4 "$TRG/ext/api4"
 dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
 
 # gen tarball

diff --git a/distmaker/dists/drupal6_php5.sh b/distmaker/dists/drupal6_php5.sh
index f3d4ba33a5440b1748138ff5560ab5f5a0c4ed6b..7616d3f6658b143d1b9a8d7842f32a54e598280d 100755 (executable)
--- a/distmaker/dists/drupal6_php5.sh
+++ b/distmaker/dists/drupal6_php5.sh
@@ -23,6 +23,7 @@ dm_install_packages "$SRC/packages" "$TRG/packages"
 dm_install_vendor "$SRC/vendor" "$TRG/vendor"
 dm_install_bower "$SRC/bower_components" "$TRG/bower_components"
 dm_install_drupal "$SRC/drupal" "$TRG/drupal"
+dm_install_cvext org.civicrm.api4 "$TRG/ext/api4"
 dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
 
 # gen tarball

diff --git a/distmaker/dists/drupal7_dir_php5.sh b/distmaker/dists/drupal7_dir_php5.sh
index 8d50524a320b7704462a8a039523de4c1e345deb..b753330028acef278e18f4c0f18ac609de1a2e23 100644 (file)
--- a/distmaker/dists/drupal7_dir_php5.sh
+++ b/distmaker/dists/drupal7_dir_php5.sh
@@ -30,6 +30,7 @@ dm_install_packages $DM_PACKAGESDIR "$TRG/packages"
 dm_install_vendor "$SRC/vendor" "$TRG/vendor"
 dm_install_bower "$SRC/bower_components" "$TRG/bower_components"
 dm_install_drupal "$DM_DRUPALDIR" "$TRG/drupal"
+dm_install_cvext org.civicrm.api4 "$TRG/ext/api4"
 dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
 
 # gen tarball

diff --git a/distmaker/dists/drupal_php5.sh b/distmaker/dists/drupal_php5.sh
index f34db2803a6232c99dbbfb5490c86712df368eed..62433e5485d41d70c4bd6720dd525498f1f77f29 100755 (executable)
--- a/distmaker/dists/drupal_php5.sh
+++ b/distmaker/dists/drupal_php5.sh
@@ -23,6 +23,7 @@ dm_install_packages "$SRC/packages" "$TRG/packages"
 dm_install_vendor "$SRC/vendor" "$TRG/vendor"
 dm_install_bower "$SRC/bower_components" "$TRG/bower_components"
 dm_install_drupal "$SRC/drupal" "$TRG/drupal"
+dm_install_cvext org.civicrm.api4 "$TRG/ext/api4"
 dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
 
 # gen tarball

diff --git a/distmaker/dists/drupal_sk_php5.sh b/distmaker/dists/drupal_sk_php5.sh
index 3fb36905fd0096a083dc3f95f843c6b7921cf287..0056b00a6cfeacba2114bb2ff77433069c74636c 100755 (executable)
--- a/distmaker/dists/drupal_sk_php5.sh
+++ b/distmaker/dists/drupal_sk_php5.sh
@@ -23,6 +23,7 @@ dm_install_packages "$SRC/packages" "$TRG/packages"
 dm_install_vendor "$SRC/vendor" "$TRG/vendor"
 dm_install_bower "$SRC/bower_components" "$TRG/bower_components"
 dm_install_drupal "$SRC/drupal" "$TRG/drupal"
+dm_install_cvext org.civicrm.api4 "$TRG/ext/api4"
 dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
 
 # delete packages that distributions on Drupal.org repalce if present

diff --git a/distmaker/dists/joomla_php5.sh b/distmaker/dists/joomla_php5.sh
index 1b02b453e1c2ff7968be4094df5a35a311e12209..31fcb70f91e111b42b401d9043aed0168eb03ed6 100755 (executable)
--- a/distmaker/dists/joomla_php5.sh
+++ b/distmaker/dists/joomla_php5.sh
@@ -22,6 +22,7 @@ dm_install_core "$SRC" "$TRG"
 dm_install_packages "$SRC/packages" "$TRG/packages"
 dm_install_vendor "$SRC/vendor" "$TRG/vendor"
 dm_install_bower "$SRC/bower_components" "$TRG/bower_components"
+dm_install_cvext org.civicrm.api4 "$TRG/ext/api4"
 dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
 
 ## WTF: It's so good we'll install it twice!

diff --git a/distmaker/dists/wordpress_php5.sh b/distmaker/dists/wordpress_php5.sh
index ee0628e376f8f7a209f0133a2b31b9746428bcf0..c588745bd9b164d3375998b38020c569ffe9c7ac 100644 (file)
--- a/distmaker/dists/wordpress_php5.sh
+++ b/distmaker/dists/wordpress_php5.sh
@@ -23,6 +23,7 @@ dm_install_packages "$SRC/packages" "$TRG/civicrm/civicrm/packages"
 dm_install_vendor "$SRC/vendor" "$TRG/civicrm/civicrm/vendor"
 dm_install_bower "$SRC/bower_components" "$TRG/civicrm/civicrm/bower_components"
 dm_install_wordpress "$SRC/WordPress" "$TRG/civicrm"
+dm_install_cvext org.civicrm.api4 "$TRG/civicrm/civicrm/ext/api4"
 dm_install_cvext com.iatspayments.civicrm "$TRG/civicrm/civicrm/ext/iatspayments"
 
 # gen tarball

diff --git a/release-notes/5.5.0.md b/release-notes/5.5.0.md
index c8a06f6155835e8e8c9fa50120d534cb70df6c7d..2e764376c85337aadf26c460d4f4b6bc17c08fe4 100644 (file)
--- a/release-notes/5.5.0.md
+++ b/release-notes/5.5.0.md
@@ -31,6 +31,12 @@ Released September 5, 2018
   When a user editing a custom field that uses an option group, you may now
   switch to any non-reserved option groups.
 
+- **Further Fix for updating custom field when not linked to an option group.
+ ([12789](https://github.com/civicrm/civicrm-core/pull/12789))**
+
+  Further following fix from 12729 to ensure that the Edit Custom Field form works when
+  not linked to an option group.
+
 - **Upgrader - When updating message templates, identify them by name
   ([12674](https://github.com/civicrm/civicrm-core/pull/12674))**
 
@@ -251,7 +257,7 @@ Released September 5, 2018
 
 - **[infrastructure/ops#842](https://lab.civicrm.org/infrastructure/ops/issues/842)
   RSS feed and Getting Started are not displaying in dashlets
-  ([https://github.com/civicrm/civicrm-core/pull/12756])**
+  ([12756](https://github.com/civicrm/civicrm-core/pull/12756))**
 
 - **[dev/core#353](https://lab.civicrm.org/dev/core/issues/353) As of 5.4.0,
   Activity Search gives an empty result set
@@ -769,8 +775,8 @@ This release was developed by the following code authors:
 AGH Strategies - Andrew Hunt; Agileware - Alok Patel; Australian Greens - Seamus
 Lee; Calibrate - Wannes De Roy; Caltha - Tomasz Pietrzkowski; Chris Burgess;
 CiviCoop - Jaap Jansma; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Sunil
-Pawar, Yashodha Chaku; CompuCorp - Camilo Rodriguez, Mukesh Ram; Coop SymbioTIC
-- Mathieu Lutfy; Electronic Frontier Foundation - Mark Burdett; eQuality
+Pawar, Yashodha Chaku; CompuCorp - Camilo Rodriguez, Mukesh Ram; Coop SymbioTIC -
+Mathieu Lutfy; Electronic Frontier Foundation - Mark Burdett; eQuality
 Technology - Greg Rundlett; Freeform Solutions - Herb van den Dool; Fuzion -
 Jitendra Purohit; JMA Consulting - Monish Deb; John Kingsnorth; Left Join Labs -
 Sean Madsen; Megaphone Technology Consulting - Jon Goldberg; MJW Consulting -