merge from 1.5.1.8

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10157 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-02-21 07:42:16 +00:00
parent 2d3dfe7bc7
commit 90c18a8bb8
42 changed files with 3249 additions and 149 deletions

View file

@ -1,5 +1,12 @@
<?php
require_once _XE_PATH_ . "libs/phpmailer/phpmailer.php";
if(version_compare(PHP_VERSION, '5.0.0', '>='))
{
require_once _XE_PATH_ . "libs/phpmailer/phpmailer.php";
}
else
{
require_once _XE_PATH_ . "libs/phpmailer/class.phpmailer.php";
}
/**
* @brief Mailing class for XpressEngine