From: <gi...@ma...> - 2009-05-03 16:13:54
|
The branch, master has been updated via a2146d2a8b13a471e7d8a56aea68622bd681cbf0 (commit) from f2c854a349dd1b0996c1379c3a2de0f194a935bc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a2146d2a8b13a471e7d8a56aea68622bd681cbf0 Author: Paul Richards <pa...@ma...> Date: Sun May 3 17:13:29 2009 +0100 autload disposable + phpmailer classes ----------------------------------------------------------------------- Summary of changes: core.php | 9 +++++++++ core/email_api.php | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) ----------------------------------------------------------------------- commit a2146d2a8b13a471e7d8a56aea68622bd681cbf0 Author: Paul Richards <pa...@ma...> Date: Sun May 3 17:13:29 2009 +0100 autload disposable + phpmailer classes diff --git a/core.php b/core.php index 386dbe1..f6beb47 100644 --- a/core.php +++ b/core.php @@ -83,6 +83,15 @@ function __autoload( $className ) { global $g_core_path; + switch ( $className ) { + case 'DisposableEmailChecker': + require_once( $g_core_path . 'disposable' . DIRECTORY_SEPARATOR . 'disposable.php' ); + return; + case 'PHPMailer': + require_once( PHPMAILER_PATH . 'class.phpmailer.php' ); // phpmailer_path is defined in email api + return; + } + $t_require_path = $g_core_path . 'classes' . DIRECTORY_SEPARATOR . $className . '.class.php'; if ( file_exists( $t_require_path ) ) { diff --git a/core/email_api.php b/core/email_api.php index 108a512..45d2ca5 100644 --- a/core/email_api.php +++ b/core/email_api.php @@ -54,14 +54,6 @@ require_once( $t_core_dir . 'email_queue_api.php' ); * requires relationship_api */ require_once( $t_core_dir . 'relationship_api.php' ); -/** - * requires disposable_api - */ -require_once( $t_core_dir . 'disposable' . DIRECTORY_SEPARATOR . 'disposable.php' ); -/** - * requires class.phpmailer.php - */ -require_once( PHPMAILER_PATH . 'class.phpmailer.php' ); # reusable object of class SMTP $g_phpMailer = null; ----------------------------------------------------------------------- -- Mantis Bug Tracker |