Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Log.php require_once statements #13842

Merged
merged 2 commits into from
Mar 17, 2019
Merged

Remove Log.php require_once statements #13842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d085894
Remove require_once statements
seamuslee001 Mar 16, 2019
4f897b7
Ensure that all original Log Files are removed especially on Joomla
seamuslee001 Mar 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CRM/Core/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
* @copyright CiviCRM LLC (c) 2004-2019
*/

require_once 'Log.php';
require_once 'Mail.php';

require_once 'api/api.php';
Expand Down
2 changes: 0 additions & 2 deletions CRM/Core/Error.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
require_once 'PEAR/Exception.php';
require_once 'CRM/Core/Exception.php';

require_once 'Log.php';

/**
* Class CRM_Exception
*/
Expand Down
18 changes: 18 additions & 0 deletions CRM/Utils/Check/Component/Source.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down