From cb95749b248d37bafa0be020d4f72045b7965bb9 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 15 Jan 2020 13:41:09 -0800 Subject: [PATCH] CRM_Core_IDS - Fix loading with alternate packages path --- CRM/Core/IDS.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Core/IDS.php b/CRM/Core/IDS.php index e72afd146f..7a3eded15a 100644 --- a/CRM/Core/IDS.php +++ b/CRM/Core/IDS.php @@ -103,14 +103,14 @@ class CRM_Core_IDS { public static function createBaseConfig() { $config = \CRM_Core_Config::singleton(); $tmpDir = empty($config->uploadDir) ? Civi::paths()->getVariable('civicrm.compile', 'path') : $config->uploadDir; - global $civicrm_root; + $pkgs = Civi::paths()->getVariable('civicrm.packages', 'path'); return [ 'General' => [ 'filter_type' => 'xml', - 'filter_path' => "{$civicrm_root}/packages/IDS/default_filter.xml", + 'filter_path' => "{$pkgs}/IDS/default_filter.xml", 'tmp_path' => $tmpDir, - 'HTML_Purifier_Path' => $civicrm_root . 'packages/IDS/vendors/htmlpurifier/HTMLPurifier.auto.php', + 'HTML_Purifier_Path' => $pkgs . '/IDS/vendors/htmlpurifier/HTMLPurifier.auto.php', 'HTML_Purifier_Cache' => $tmpDir, 'scan_keys' => '', 'exceptions' => ['__utmz', '__utmc'], -- 2.25.1