projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b1db062
)
Use global since Civi\Core\Paths isn't loaded yet
author
Herb
<herb@3speedhub.com>
Mon, 1 Jul 2019 02:25:52 +0000
(22:25 -0400)
committer
Tim Otten
<totten@civicrm.org>
Tue, 16 Jul 2019 01:58:12 +0000
(18:58 -0700)
CRM/Core/Config/Runtime.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Core/Config/Runtime.php
b/CRM/Core/Config/Runtime.php
index 3b979627f930b2ef8a082984bcf2420e139c09dd..61758bf365d377bafb956e81b020a8270367e05a 100644
(file)
--- a/
CRM/Core/Config/Runtime.php
+++ b/
CRM/Core/Config/Runtime.php
@@
-106,7
+106,7
@@
class CRM_Core_Config_Runtime extends CRM_Core_Config_MagicMerge {
CRM_Utils_File::restrictAccess($this->templateCompileDir);
}
- $civicrm_private =
Civi::paths()->getPath('[civicrm.private]')
;
+ $civicrm_private =
$GLOBALS['civicrm_paths']['civicrm.private']
;
if (!empty($civicrm_private)) {
$this->configAndLogDir = rtrim($civicrm_private, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . 'ConfigAndLog' . DIRECTORY_SEPARATOR;
}