From db01dd40b761b76b4a021329950731b5b28b5cfa Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Sun, 26 Jan 2020 19:15:03 -0800 Subject: [PATCH] (dev/translation#30) Undo new MagicMerge::$l10nDir property 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 | 1 - 1 file changed, 1 deletion(-) diff --git a/CRM/Core/Config/MagicMerge.php b/CRM/Core/Config/MagicMerge.php index 401c0c0ef5..84f27ed990 100644 --- 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. -- 2.25.1