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:
1b94154
)
(dev/translation#30) Undo new MagicMerge::$l10nDir property
author
Tim Otten
<totten@civicrm.org>
Mon, 27 Jan 2020 03:15:03 +0000
(19:15 -0800)
committer
Tim Otten
<totten@civicrm.org>
Mon, 27 Jan 2020 03:15:03 +0000
(19:15 -0800)
The previous commit added a new property `l10nDir` to `MagicMerge`.
The property doesn't seem to be needed, so omit it.
CRM/Core/Config/MagicMerge.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Core/Config/MagicMerge.php
b/CRM/Core/Config/MagicMerge.php
index 401c0c0ef5c91f78e07e1dc6adaf47adae60cf74..84f27ed990f471fd1847a6b98e8b2ec9d35e41ca 100644
(file)
--- a/
CRM/Core/Config/MagicMerge.php
+++ b/
CRM/Core/Config/MagicMerge.php
@@
-178,7
+178,6
@@
class CRM_Core_Config_MagicMerge {
// Option: `restrict` - auto-restrict remote access
'configAndLogDir' => ['path', 'civicrm.log', ['mkdir', 'restrict']],
'templateCompileDir' => ['path', 'civicrm.compile', ['mkdir', 'restrict']],
- 'l10nDir' => ['path', 'civicrm.l10n', ['mkdir', 'restrict']],
// "setting-path" properties are settings with special filtering
// to return normalized file paths.