Merge pull request #13602 from civicrm/5.11

5.11 to master
civicrm · Feb 14, 2019 · 45e44c3 · 45e44c3
2 parents e983763 + 2d73915
commit 45e44c3
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 4 deletions.
diff --git a/CRM/ACL/BAO/ACL.php b/CRM/ACL/BAO/ACL.php
@@ -782,10 +782,10 @@ public static function whereClause($type, &$tables, &$whereTables, $contactID =
         while ($dao->fetch()) {
           $groupIDs[] = $dao->id;
 
-          if (($dao->saved_search_id || $dao->children || $dao->parents) &&
-            $dao->cache_date == NULL
-          ) {
-            CRM_Contact_BAO_GroupContactCache::load($dao);
+          if (($dao->saved_search_id || $dao->children || $dao->parents)) {
+            if ($dao->cache_date == NULL) {
+              CRM_Contact_BAO_GroupContactCache::load($dao);
+            }
             $groupContactCacheClause = " UNION SELECT contact_id FROM civicrm_group_contact_cache WHERE group_id IN (" . implode(', ', $groupIDs) . ")";
           }
 

diff --git a/release-notes/5.10.2.md b/release-notes/5.10.2.md
@@ -0,0 +1,56 @@
+# CiviCRM 5.10.2
+
+Released February 14, 2019
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?*                                         |         |
+|:--------------------------------------------------------------- |:-------:|
+| Fix security vulnerabilities?                                   |   no    |
+| Change the database schema?                                     |   no    |
+| Alter the API?                                                  |   no    |
+| Require attention to configuration options?                     |   no    |
+| Fix problems installing or upgrading to a previous version?     |   no    |
+| Introduce features?                                             |   no    |
+| **Fix bugs?**                                                   | **yes** |
+
+## <a name="bugs"></a>Bugs resolved
+
+- **([dev/core#681](https://lab.civicrm.org/dev/core/issues/681)) CiviCase - Fatal error
+  submitting "Change Case Status" form
+  ([13595](https://github.com/civicrm/civicrm-core/pull/13595))**
+
+  There was a fatal error generated when submitting the change case status form
+  because the end_date was not properly converted to MySQL date format.
+
+- **([dev/core#721](https://lab.civicrm.org/dev/core/issues/721)) ACLs - Fix regression
+  on rebuilding smart group caches when ACLs are used
+  ([13597](https://github.com/civicrm/civicrm-core/pull/13597))**
+
+  Fixed a recent regression whereby ability to see contacts permissioned by an 
+  ACL over a smart group depended on the freshness of the group cache.
+
+- **([dev/core#715](https://lab.civicrm.org/dev/core/issues/715)) Relationships - Fix regression
+  preventing deletion of relationship types in UI.
+  ([13590](https://github.com/civicrm/civicrm-core/pull/13590))**
+
+  Fixed a recent regression whereby ability to delete a relationship type
+  from the user interface was broken.
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; MJW Consulting - Matthew Wire; Fuzion - Jitendra Purohit;
+CiviCRM - Mathieu Luffy and Coleman Watts; Australian Greens - Seamus Lee
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andrew Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.