Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 2063)
+++ branches/2.8.x/CHANGELOG	(revision 2064)
@@ -12,6 +12,9 @@
 ===============================================================================
 
 
+01 Jan-2014 Build 2064 Manuela v.d.Decken(DarkViper)
+! register PHPMailerAutoload now in initialize instead of class.WbMailer.php
+# a unsecure require() fixed in class PHPMailer::__construct() (notice to Syncro given)
 01 Jan-2014 Build 2063 Dietmar Woellbrink (Luisehahne)
 # problems with confirmation mail solved
 01 Jan-2014 Build 2062 Manuela v.d.Decken(DarkViper)
Index: branches/2.8.x/wb/include/phpmailer/class.phpmailer.php
===================================================================
--- branches/2.8.x/wb/include/phpmailer/class.phpmailer.php	(revision 2063)
+++ branches/2.8.x/wb/include/phpmailer/class.phpmailer.php	(revision 2064)
@@ -572,7 +572,11 @@
         $this->exceptions = ($exceptions == true);
         //Make sure our autoloader is loaded
         if (!in_array('PHPMailerAutoload', spl_autoload_functions())) {
-            require 'PHPMailerAutoload.php';
+            $sAutoLoaderFile = __DIR__.DIRECTORY_SEPARATOR.'PHPMailerAutoload.php';
+            if (!is_readable($sAutoLoaderFile)) {
+                throw new phpmailerException('Unable to find autoloader: [' . $sAutoLoaderFile . ']');
+            }
+            require($sAutoLoaderFile);
         }
     }
 
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 2063)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 2064)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.4');
-if(!defined('REVISION')) define('REVISION', '2063');
+if(!defined('REVISION')) define('REVISION', '2064');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/framework/initialize.php
===================================================================
--- branches/2.8.x/wb/framework/initialize.php	(revision 2063)
+++ branches/2.8.x/wb/framework/initialize.php	(revision 2064)
@@ -234,7 +234,8 @@
 	}
 	WbAutoloader::doRegister(array(ADMIN_DIRECTORY=>'a', 'modules'=>'m', 'templates'=>'t', 'include'=>'i'));
 // instantiate and initialize adaptor for temporary registry replacement ---
-	WbAdaptor::getInstance()->getWbConstants();
+    $oReg = WbAdaptor::getInstance();
+	$oReg->getWbConstants();
 // register TWIG autoloader ---
 	$sTmp = dirname(dirname(__FILE__)).'/include/Sensio/Twig/lib/Twig/Autoloader.php';
 	if(!class_exists('Twig_Autoloader')) { 
@@ -241,6 +242,10 @@
 		include($sTmp); 
 	}
 	Twig_Autoloader::register();
+// register PHPMailer autoloader ---
+    if (!function_exists('PHPMailerAutoload')) {
+        require($oReg->AppPath.'include/phpmailer/PHPMailerAutoload.php');
+    }
 // aktivate exceptionhandler ---
 	if(!function_exists('globalExceptionHandler')) {
 		include(dirname(__FILE__).'/globalExceptionHandler.php');
@@ -382,7 +387,7 @@
 	}
 /** end of deprecated part **/
 // instantiate and initialize adaptor for temporary registry replacement ---
-	WbAdaptor::getInstance()->getWbConstants();
+	$oReg->getWbConstants();
 // load and activate new global translation table
 	Translate::getInstance()->initialize('en',
 										 (defined('DEFAULT_LANGUAGE') ? DEFAULT_LANGUAGE : ''), 
Index: branches/2.8.x/wb/framework/class.WbMailer.php
===================================================================
--- branches/2.8.x/wb/framework/class.WbMailer.php	(revision 2063)
+++ branches/2.8.x/wb/framework/class.WbMailer.php	(revision 2064)
@@ -22,17 +22,6 @@
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 */
-/* -------------------------------------------------------- */
-// Must include code to stop this file being accessed directly
-if(!defined('WB_PATH')) {
-	require_once(dirname(__FILE__).'/globalExceptionHandler.php');
-	throw new IllegalFileException();
-}
-/* -------------------------------------------------------- */
-// Include PHPMailer class if needed
-if (!function_exists('PHPMailerAutoload')) {
-    require(WbAdaptor::getInstance()->AppPath.'include/phpmailer/PHPMailerAutoload.php');
-}
 
 class WbMailer extends PHPMailer
 {