Merge branch '5.11' of https://github.com/civicrm/civicrm-core

diff --cc CRM/Contact/BAO/Query.php
Simple merge

diff --cc CRM/Core/BAO/CustomField.php
Simple merge

diff --cc CRM/Core/Form/Renderer.php
index 764a0098d1deb83e6f2367d9b0713b796d578b15,82847220267918fede00c27adff8e6d09021bde6..1eeb9f0b7d6400782f4826baa92baa644cac5361
--- 1/CRM/Core/Form/Renderer.php
--- 2/CRM/Core/Form/Renderer.php
+++ b/CRM/Core/Form/Renderer.php
@@@ -325,9 -333,9 +333,9 @@@ class CRM_Core_Form_Renderer extends HT
  
      foreach ($vals as $val) {
        // Format contact as link
 -      if ($entity == 'contact' && CRM_Contact_BAO_Contact_Permission::allow($val['id'], CRM_Core_Permission::VIEW)) {
 +      if ($entity == 'Contact' && CRM_Contact_BAO_Contact_Permission::allow($val['id'], CRM_Core_Permission::VIEW)) {
          $url = CRM_Utils_System::url("civicrm/contact/view", array('reset' => 1, 'cid' => $val['id']));
-         $val['label'] = '<a class="view-contact no-popup" href="' . $url . '" title="' . ts('View Contact') . '">' . $val['label'] . '</a>';
 -        $val['label'] = '<a class="view-' . $entity . ' no-popup" href="' . $url . '" title="' . ts('View Contact') . '">' . CRM_Utils_String::purifyHTML($val['label']) . '</a>';
++        $val['label'] = '<a class="view-contact no-popup" href="' . $url . '" title="' . ts('View Contact') . '">' . CRM_Utils_String::purifyHTML($val['label']) . '</a>';
        }
        $display[] = $val['label'];
      }

diff --cc CRM/Profile/Form.php
Simple merge

diff --cc js/Common.js
Simple merge

diff --cc tests/phpunit/api/v3/AttachmentTest.php
Simple merge

diff --cc tests/phpunit/api/v3/ContactTest.php
Simple merge