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 #17376 from artfulrobot/artfulrobot-public-status-messages
[civicrm-core.git]
/
CRM
/
Core
/
BAO
/
StatusPreference.php
diff --git
a/CRM/Core/BAO/StatusPreference.php
b/CRM/Core/BAO/StatusPreference.php
index c09308f04fbf55ad09dfc385f5246e39b09c9ba5..d4e182eadc31ad5f76900919f303299451233e39 100644
(file)
--- a/
CRM/Core/BAO/StatusPreference.php
+++ b/
CRM/Core/BAO/StatusPreference.php
@@
-28,6
+28,7
@@
class CRM_Core_BAO_StatusPreference extends CRM_Core_DAO_StatusPreference {
* @param array $params
*
* @return array
* @param array $params
*
* @return array
+ * @throws CRM_Core_Exception
*/
public static function create($params) {
$statusPreference = new CRM_Core_BAO_StatusPreference();
*/
public static function create($params) {
$statusPreference = new CRM_Core_BAO_StatusPreference();
@@
-42,11
+43,11
@@
class CRM_Core_BAO_StatusPreference extends CRM_Core_DAO_StatusPreference {
$params['ignore_severity'] = CRM_Utils_Check::severityMap($params['ignore_severity']);
}
if ($params['ignore_severity'] > 7) {
$params['ignore_severity'] = CRM_Utils_Check::severityMap($params['ignore_severity']);
}
if ($params['ignore_severity'] > 7) {
-
CRM_Core_Error::fatal
(ts('You can not pass a severity level higher than 7.'));
+
throw new CRM_Core_Exception
(ts('You can not pass a severity level higher than 7.'));
}
// If severity is now blank, you have an invalid severity string.
if (is_null($params['ignore_severity'])) {
}
// If severity is now blank, you have an invalid severity string.
if (is_null($params['ignore_severity'])) {
-
CRM_Core_Error::fatal
(ts('Invalid string passed as severity level.'));
+
throw new CRM_Core_Exception
(ts('Invalid string passed as severity level.'));
}
// Check if this StatusPreference already exists.
}
// Check if this StatusPreference already exists.
@@
-59,7
+60,7
@@
class CRM_Core_BAO_StatusPreference extends CRM_Core_DAO_StatusPreference {
$statusPreference->copyValues($params);
$statusPreference->copyValues($params);
- $edit = (
$statusPreference->id) ? TRUE : FALSE
;
+ $edit = (
bool) $statusPreference->id
;
if ($edit) {
CRM_Utils_Hook::pre('edit', 'StatusPreference', $statusPreference->id, $statusPreference);
}
if ($edit) {
CRM_Utils_Hook::pre('edit', 'StatusPreference', $statusPreference->id, $statusPreference);
}