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 #10562 from JMAConsulting/CRM-20411
[civicrm-core.git]
/
api
/
class.api.php
diff --git
a/api/class.api.php
b/api/class.api.php
index 6edea34b555737509ca3fb38c88fbd39bf2cf1aa..88d9b2116596c52bb40f898c97552faea70bdf26 100644
(file)
--- a/
api/class.api.php
+++ b/
api/class.api.php
@@
-112,7
+112,9
@@
class civicrm_api3 {
return;
}
if (isset($config) && isset($config['conf_path'])) {
return;
}
if (isset($config) && isset($config['conf_path'])) {
- define('CIVICRM_SETTINGS_PATH', $config['conf_path'] . '/civicrm.settings.php');
+ if (!defined('CIVICRM_SETTINGS_PATH')) {
+ define('CIVICRM_SETTINGS_PATH', $config['conf_path'] . '/civicrm.settings.php');
+ }
require_once CIVICRM_SETTINGS_PATH;
require_once 'CRM/Core/ClassLoader.php';
require_once 'api/api.php';
require_once CIVICRM_SETTINGS_PATH;
require_once 'CRM/Core/ClassLoader.php';
require_once 'api/api.php';