projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add buttons to 'Cleanup caches and update paths' in standard way
[civicrm-core.git]
/
CRM
/
Admin
/
Form
/
Setting
/
Component.php
diff --git
a/CRM/Admin/Form/Setting/Component.php
b/CRM/Admin/Form/Setting/Component.php
index 2fd2ea3d595383ba345d524779ee0a2298c7a97c..60d024b2b71609a5034722dc76ab5014f2a3d392 100644
(file)
--- a/
CRM/Admin/Form/Setting/Component.php
+++ b/
CRM/Admin/Form/Setting/Component.php
@@
-66,12
+66,12
@@
class CRM_Admin_Form_Setting_Component extends CRM_Admin_Form_Setting {
$errors = [];
if (array_key_exists('enable_components', $fields) && is_array($fields['enable_components'])) {
$errors = [];
if (array_key_exists('enable_components', $fields) && is_array($fields['enable_components'])) {
- if (
in_array('CiviPledge', $fields['enable_components
']) &&
-
!in_array('CiviContribute', $fields['enable_components
'])
+ if (
!empty($fields['enable_components']['CiviPledge
']) &&
+
empty($fields['enable_components']['CiviContribute
'])
) {
$errors['enable_components'] = ts('You need to enable CiviContribute before enabling CiviPledge.');
}
) {
$errors['enable_components'] = ts('You need to enable CiviContribute before enabling CiviPledge.');
}
- if (
in_array('CiviCase', $fields['enable_components
']) &&
+ if (
!empty($fields['enable_components']['CiviCase
']) &&
!CRM_Core_DAO::checkTriggerViewPermission(TRUE, FALSE)
) {
$errors['enable_components'] = ts('CiviCase requires CREATE VIEW and DROP VIEW permissions for the database.');
!CRM_Core_DAO::checkTriggerViewPermission(TRUE, FALSE)
) {
$errors['enable_components'] = ts('CiviCase requires CREATE VIEW and DROP VIEW permissions for the database.');