From 0489c3bcbad19801cba52c489f17ce438558ce2c Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Mon, 18 Mar 2019 06:53:05 +1100 Subject: [PATCH] Update Config and class loader paths --- CRM/Core/ClassLoader.php | 2 +- CRM/Core/IDS.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Core/ClassLoader.php b/CRM/Core/ClassLoader.php index 86870b1db9..17998d2235 100644 --- a/CRM/Core/ClassLoader.php +++ b/CRM/Core/ClassLoader.php @@ -190,7 +190,7 @@ class CRM_Core_ClassLoader { // we do this to prevent a autoloader errors with joomla / 3rd party packages // Use absolute path, since we don't know the content of include_path yet. // CRM-11304 - $file = dirname(__FILE__) . '/../../packages/IDS/vendors/htmlpurifier/HTMLPurifier/Bootstrap.php'; + $file = dirname(__FILE__) . '/../../vendor/ezyang/htmlpurifier/library/HTMLPurifier/Bootstrap.php'; if (file_exists($file)) { return $file; } diff --git a/CRM/Core/IDS.php b/CRM/Core/IDS.php index 915a740ace..8d1fed7f04 100644 --- a/CRM/Core/IDS.php +++ b/CRM/Core/IDS.php @@ -125,7 +125,7 @@ class CRM_Core_IDS { 'filter_type' => 'xml', 'filter_path' => "{$civicrm_root}/packages/IDS/default_filter.xml", 'tmp_path' => $tmpDir, - 'HTML_Purifier_Path' => 'IDS/vendors/htmlpurifier/HTMLPurifier.auto.php', + 'HTML_Purifier_Path' => $civicrm_root . '/vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php', 'HTML_Purifier_Cache' => $tmpDir, 'scan_keys' => '', 'exceptions' => array('__utmz', '__utmc'), -- 2.25.1