Revision 2064
Added by darkviper almost 11 years ago
! register PHPMailerAutoload now in initialize instead of class.WbMailer.php
- a unsecure require() fixed in class PHPMailer::__construct() (notice to Syncro given)
| initialize.php | ||
|---|---|---|
| 234 | 234 |
} |
| 235 | 235 |
WbAutoloader::doRegister(array(ADMIN_DIRECTORY=>'a', 'modules'=>'m', 'templates'=>'t', 'include'=>'i')); |
| 236 | 236 |
// instantiate and initialize adaptor for temporary registry replacement --- |
| 237 |
WbAdaptor::getInstance()->getWbConstants(); |
|
| 237 |
$oReg = WbAdaptor::getInstance(); |
|
| 238 |
$oReg->getWbConstants(); |
|
| 238 | 239 |
// register TWIG autoloader --- |
| 239 | 240 |
$sTmp = dirname(dirname(__FILE__)).'/include/Sensio/Twig/lib/Twig/Autoloader.php'; |
| 240 | 241 |
if(!class_exists('Twig_Autoloader')) {
|
| 241 | 242 |
include($sTmp); |
| 242 | 243 |
} |
| 243 | 244 |
Twig_Autoloader::register(); |
| 245 |
// register PHPMailer autoloader --- |
|
| 246 |
if (!function_exists('PHPMailerAutoload')) {
|
|
| 247 |
require($oReg->AppPath.'include/phpmailer/PHPMailerAutoload.php'); |
|
| 248 |
} |
|
| 244 | 249 |
// aktivate exceptionhandler --- |
| 245 | 250 |
if(!function_exists('globalExceptionHandler')) {
|
| 246 | 251 |
include(dirname(__FILE__).'/globalExceptionHandler.php'); |
| ... | ... | |
| 382 | 387 |
} |
| 383 | 388 |
/** end of deprecated part **/ |
| 384 | 389 |
// instantiate and initialize adaptor for temporary registry replacement --- |
| 385 |
WbAdaptor::getInstance()->getWbConstants();
|
|
| 390 |
$oReg->getWbConstants();
|
|
| 386 | 391 |
// load and activate new global translation table |
| 387 | 392 |
Translate::getInstance()->initialize('en',
|
| 388 | 393 |
(defined('DEFAULT_LANGUAGE') ? DEFAULT_LANGUAGE : ''),
|
Also available in: Unified diff