projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #17867 from MegaphoneJon/mailing-70
[civicrm-core.git]
/
CRM
/
Profile
/
Page
/
Listings.php
diff --git
a/CRM/Profile/Page/Listings.php
b/CRM/Profile/Page/Listings.php
index 46807507ce5453ef99deaa38d17672214a9d7a9c..c521848e1cf74eacd51148fe9f20241bc815ece2 100644
(file)
--- a/
CRM/Profile/Page/Listings.php
+++ b/
CRM/Profile/Page/Listings.php
@@
-13,7
+13,6
@@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
- *
*/
/**
*/
/**
@@
-100,7
+99,7
@@
class CRM_Profile_Page_Listings extends CRM_Core_Page {
// check if we are rendering mixed profiles
if (CRM_Core_BAO_UFGroup::checkForMixProfiles($this->_profileIds)) {
// check if we are rendering mixed profiles
if (CRM_Core_BAO_UFGroup::checkForMixProfiles($this->_profileIds)) {
- CRM_Core_Error::
fatal
(ts('You cannot combine profiles of multiple types.'));
+ CRM_Core_Error::
statusBounce
(ts('You cannot combine profiles of multiple types.'));
}
$this->_gid = $this->_profileIds[0];
}
$this->_gid = $this->_profileIds[0];
@@
-282,7
+281,7
@@
class CRM_Profile_Page_Listings extends CRM_Core_Page {
$ufgroupDAO = new CRM_Core_DAO_UFGroup();
$ufgroupDAO->id = $this->_gid;
if (!$ufgroupDAO->find(TRUE)) {
$ufgroupDAO = new CRM_Core_DAO_UFGroup();
$ufgroupDAO->id = $this->_gid;
if (!$ufgroupDAO->find(TRUE)) {
- CRM_Core_Error::
fatal(
);
+ CRM_Core_Error::
statusBounce('Unable to find matching UF Group'
);
}
}
}
}