Merge pull request #19760 from civicrm/5.36

5.36

diff --cc ext/afform/core/CRM/Afform/Page/AfformBase.php
index 6725d15dc9c7139ed3e2716f2a482e6a9537c8a3,ef78fec0b4b1084afb67d8d9103646e5496ca5e2..3530e555dbae9d75f2556b73b209bff59c6bcd03
--- 1/ext/afform/core/CRM/Afform/Page/AfformBase.php
--- 2/ext/afform/core/CRM/Afform/Page/AfformBase.php
+++ b/ext/afform/core/CRM/Afform/Page/AfformBase.php
@@@ -20,21 -19,20 +19,20 @@@ class CRM_Afform_Page_AfformBase extend
        ->setModules([$afform['module_name'], 'afformStandalone'])
        ->load();
  
-     if (!empty($afform['title'])) {
-       $title = strip_tags($afform['title']);
-       CRM_Utils_System::setTitle($title);
-     }
- 
      // If the user has "access civicrm" append home breadcrumb
      if (CRM_Core_Permission::check('access CiviCRM')) {
 -      CRM_Utils_System::appendBreadCrumb([['title' => ts('CiviCRM'), 'url' => CRM_Utils_System::url('civicrm')]]);
 +      CRM_Utils_System::appendBreadCrumb([['title' => E::ts('CiviCRM'), 'url' => CRM_Utils_System::url('civicrm')]]);
        // If the user has "admin civicrm" & the admin extension is enabled
-       if (CRM_Core_Permission::check('administer CiviCRM') && CRM_Utils_Array::findAll(
-           \CRM_Extension_System::singleton()->getMapper()->getActiveModuleFiles(),
-           ['fullName' => 'org.civicrm.afform_admin']
-         )) {
-         CRM_Utils_System::appendBreadCrumb([['title' => E::ts('Form Builder'), 'url' => CRM_Utils_System::url('civicrm/admin/afform')]]);
-         CRM_Utils_System::appendBreadCrumb([['title' => E::ts('Edit Form'), 'url' => CRM_Utils_System::url('civicrm/admin/afform', NULL, FALSE, '/edit/' . $pageArgs['afform'])]]);
+       if (CRM_Core_Permission::check('administer CiviCRM')) {
+         if (($pagePath[1] ?? NULL) === 'admin') {
+           CRM_Utils_System::appendBreadCrumb([['title' => E::ts('Admin'), 'url' => CRM_Utils_System::url('civicrm/admin')]]);
+         }
+         if ($afform['type'] !== 'system' &&
+           \CRM_Extension_System::singleton()->getMapper()->isActiveModule('afform_admin')
+         ) {
+           CRM_Utils_System::appendBreadCrumb([['title' => E::ts('Form Builder'), 'url' => CRM_Utils_System::url('civicrm/admin/afform')]]);
+           CRM_Utils_System::appendBreadCrumb([['title' => E::ts('Edit Form'), 'url' => CRM_Utils_System::url('civicrm/admin/afform', NULL, FALSE, '/edit/' . $pageArgs['afform'])]]);
+         }
        }
      }
  

diff --cc ext/afform/core/Civi/Api4/Action/Afform/Get.php
Simple merge

diff --cc ext/search/ang/crmSearchActions/crmSearchActionDelete.ctrl.js
index 07753fb9ba682c78c01a0ef41e8457bcd360e524,148fe633430979f600c37ec9c707d9e4834500ee..911e832eea87f7454c382811742085ff2d9ab4ee
--- 1/ext/search/ang/crmSearchActions/crmSearchActionDelete.ctrl.js
--- 2/ext/search/ang/crmSearchActions/crmSearchActionDelete.ctrl.js
+++ b/ext/search/ang/crmSearchActions/crmSearchActionDelete.ctrl.js
@@@ -2,9 -2,9 +2,9 @@@
    "use strict";
  
    angular.module('crmSearchActions').controller('crmSearchActionDelete', function($scope, dialogService) {
 -    var ts = $scope.ts = CRM.ts(),
 +    var ts = $scope.ts = CRM.ts('org.civicrm.search'),
        model = $scope.model,
-       ctrl = $scope.$ctrl = this;
+       ctrl = this;
  
      this.entityTitle = model.ids.length === 1 ? model.entityInfo.title : model.entityInfo.title_plural;
  

diff --cc ext/search/ang/crmSearchActions/crmSearchActionUpdate.ctrl.js
index 7eb4878f5d47fca121f6ceab6fbe87ae3fbb25ea,14c5a359c62133828f96bec4f4d246ff0b1f264a..2297be29502f1476b889bd2888048d70fcf6a534
--- 1/ext/search/ang/crmSearchActions/crmSearchActionUpdate.ctrl.js
--- 2/ext/search/ang/crmSearchActions/crmSearchActionUpdate.ctrl.js
+++ b/ext/search/ang/crmSearchActions/crmSearchActionUpdate.ctrl.js
@@@ -2,9 -2,9 +2,9 @@@
    "use strict";
  
    angular.module('crmSearchActions').controller('crmSearchActionUpdate', function ($scope, $timeout, crmApi4, dialogService) {
 -    var ts = $scope.ts = CRM.ts(),
 +    var ts = $scope.ts = CRM.ts('org.civicrm.search'),
        model = $scope.model,
-       ctrl = $scope.$ctrl = this;
+       ctrl = this;
  
      this.entityTitle = model.ids.length === 1 ? model.entityInfo.title : model.entityInfo.title_plural;
      this.values = [];

diff --cc ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInputVal.component.js
Simple merge