From d0858949c728e4f39ae43cdb14438284e1942e71 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Sat, 16 Mar 2019 12:56:22 +1100 Subject: [PATCH 1/2] Remove require_once statements --- CRM/Core/Config.php | 1 - CRM/Core/Error.php | 2 -- 2 files changed, 3 deletions(-) diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php index 2e5c7307daab..320ec6d85fa8 100644 --- a/CRM/Core/Config.php +++ b/CRM/Core/Config.php @@ -35,7 +35,6 @@ * @copyright CiviCRM LLC (c) 2004-2019 */ -require_once 'Log.php'; require_once 'Mail.php'; require_once 'api/api.php'; diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php index 163a1b44d3be..fc2ebe9856ad 100644 --- a/CRM/Core/Error.php +++ b/CRM/Core/Error.php @@ -37,8 +37,6 @@ require_once 'PEAR/Exception.php'; require_once 'CRM/Core/Exception.php'; -require_once 'Log.php'; - /** * Class CRM_Exception */ From 4f897b756c233359d21cf0be029dcda8a7cac19a Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Sun, 17 Mar 2019 08:36:22 +1100 Subject: [PATCH 2/2] Ensure that all original Log Files are removed especially on Joomla --- CRM/Utils/Check/Component/Source.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CRM/Utils/Check/Component/Source.php b/CRM/Utils/Check/Component/Source.php index 2ec2e4230956..2dc5d153e269 100644 --- a/CRM/Utils/Check/Component/Source.php +++ b/CRM/Utils/Check/Component/Source.php @@ -51,6 +51,24 @@ public function getRemovedFiles() { $files[] = '[civicrm.vendor]/pear/net_smtp/phpdoc.sh'; $files[] = '[civicrm.vendor]/phpoffice/phpword/samples'; $files[] = '[civicrm.root]/templates/CRM/common/version.tpl'; + $files[] = '[civicrm.packages]/Log.php'; + $files[] = '[civicrm.packages]/_ORIGINAL_/Log.php'; + $files[] = '[civicrm.packages]/Log/composite.php'; + $files[] = '[civicrm.packages]/Log/console.php'; + $files[] = '[civicrm.packages]/Log/daemon.php'; + $files[] = '[civicrm.packages]/Log/display.php'; + $files[] = '[civicrm.packages]/Log/error_log.php'; + $files[] = '[civicrm.packages]/Log/file.php'; + $files[] = '[civicrm.packages]/Log/firebug.php'; + $files[] = '[civicrm.packages]/Log/mail.php'; + $files[] = '[civicrm.packages]/Log/mcal.php'; + $files[] = '[civicrm.packages]/Log/mdb2.php'; + $files[] = '[civicrm.packages]/Log/null.php'; + $files[] = '[civicrm.packages]/Log/observer.php'; + $files[] = '[civicrm.packages]/Log/sql.php'; + $files[] = '[civicrm.packages]/Log/sqlite.php'; + $files[] = '[civicrm.packages]/Log/syslog.php'; + $files[] = '[civicrm.packages]/Log/win.php'; return $files; }