Merge branch 'civicrm:master' into missing_image_fatal_error

.gitattributes

@@ -0,0 +1,2 @@
+.gitattributes export-ignore  
+.gitignore export-ignore

.github/CONTRIBUTING.md

@@ -17,4 +17,4 @@ Topics of particular importance while submitting pull requests include:
 * [Release Process](https://docs.civicrm.org/dev/en/latest/core/release-process/)
 * [Developer Community](https://docs.civicrm.org/dev/en/latest/basics/community/)
 
-CiviCRM thanks you for your contributions and invites you to [log your time spent](https://civicrm.org/contributor-log) so that you (or your organization) may receive public recognition and promotion for your efforts.
+CiviCRM thanks you for your contributions.

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://civicrm.org/civicrm/contribute/transact?reset=1&id=47

.gitignore

@@ -1,8 +1,22 @@
 *~
 *.bak
 .use-civicrm-setup
-/ext/
+/ext/*
+!/ext/afform
+!/ext/authx
 !/ext/sequentialcreditnotes
+!/ext/flexmailer
+!/ext/eventcart
+!/ext/ewaysingle
+!/ext/greenwich
+/ext/greenwich/dist
+/ext/greenwich/extern
+!/ext/oauth-client
+!/ext/search_kit
+!/ext/financialacls
+!/ext/contributioncancelactions
+!/ext/recaptcha
+!/ext/payflowpro
 backdrop/
 bower_components
 CRM/Case/xml/configuration
@@ -38,6 +52,7 @@ tools/scripts/releaser/releaser.conf
 tools/tests/reports/logfile.tap
 tools/tests/reports/testdox.html
 tools/tests/reports/testdox.txt
+tools/extensions/org.civicrm.contactlayout
 l10n
 vendor
 civicrm.settings.php

.gitlab/issue_templates/problem.md

@@ -2,6 +2,8 @@ Overview
 ----------------------------------------
 _Please describe your problem or bug in detail._
 
+_If you have already posted on https://civicrm.stackexchange.com or https://chat.civicrm.org, please include the link to that conversation._
+
 Reproduction steps
 ----------------------------------------
 1. Click on **Contacts -> New Individual**.
@@ -29,7 +31,7 @@ Environment information
 <!-- Some of the items below may not be relevant for every bug - if in doubt please include more information than you think is neccessary. -->
 
 * __Browser:__ _Firefox 59.0.1/Chrome 78.0.3904/Safari 13_
-* __CiviCRM:__ _Master/5.20.0/5.19.1/5.18.2/..._
+* __CiviCRM:__ _Master/5.20.0/5.19.1/5.18.2/..._ <!-- If this problem relates to an upgrade, then specify both old and new versions -->
 * __PHP:__ _7.0/7.1/7.2/7.3/...__
 * __CMS:__ _Backdrop 1.5/Drupal 7.30/Joomla 3.3/WordPress 4.5/..._
 * __Database:__ _MySQL 5.7.7/MariaDB 10.4/..._

CONTRIBUTORS.txt

@@ -1,4 +1,4 @@
-The following people and organizations sponsored and/or contributed new and improved features to the project.
+As of CiviCRM 5.25, contributor recognition is viewable in the release notes of each individual version. This file represents an archive of recognition for people and organizations that have sponsored and/or contributed to the project prior to version 5.25.
 
 ************************************************
 Code Contributors for 5.x
@@ -26,7 +26,7 @@ Christian Wach
 Circle Interactive - Dave Jenkins, Kirk Jackson, Martin Castle, Pradeep Nayak,
     Reece Benson
 CiviCoop - Jaap Jansma, Klaas Eikelboom
-CiviDesk - Sunil Pawar, Sushant Paste, Yashodha Chaku
+CiviDesk - Sushant Paste, Yashodha Chaku
 CiviFirst - John Kirk
 CompuCorp - Camilo Rodriguez, Davi Alexandre, Debarshi Bhaumik, Michael Devery,
     Mukesh Ram, Omar Abu Hussein, René Olivo, Vinu Varshith Sekar
@@ -93,7 +93,7 @@ Romain Thouvenin
 Samson Alajede
 Selwyn Tang
 Semper IT - Karin Gerritsen
-Skvare - Mark Hanna
+Skvare - Mark Hanna, Sunil Pawar
 Squiffle Consulting - Aidan Saunders
 Stephen Palmstrom
 Steve Ellis

CRM/ACL/API.php

@@ -40,6 +40,7 @@ class CRM_ACL_API {
    *   true if yes, else false
    */
   public static function check($str, $contactID = NULL) {
+    \CRM_Core_Error::deprecatedWarning(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated.');
     if ($contactID == NULL) {
       $contactID = CRM_Core_Session::getLoggedInContactID();
     }
@@ -88,11 +89,13 @@ public static function whereClause(
     // the default value which is valid for the final AND
     $deleteClause = ' ( 1 ) ';
     if (!$skipDeleteClause) {
-      if (CRM_Core_Permission::check('access deleted contacts') and $onlyDeleted) {
-        $deleteClause = '(contact_a.is_deleted)';
+      if (CRM_Core_Permission::check('access deleted contacts')) {
+        if ($onlyDeleted) {
+          $deleteClause = '(contact_a.is_deleted)';
+        }
       }
       else {
-        // CRM-6181
+        // Exclude deleted contacts due to permissions
         $deleteClause = '(contact_a.is_deleted = 0)';
       }
     }
@@ -187,7 +190,7 @@ public static function groupPermission(
     }
 
     if (!$contactID) {
-      $contactID = CRM_Core_Session::singleton()->getLoggedInContactID();
+      $contactID = CRM_Core_Session::getLoggedInContactID();
     }
 
     $key = "{$tableName}_{$type}_{$contactID}";