Merge pull request #543 from mbabker/phpmailer

Update PHPMailer to version 5.2
joomla · Nov 24, 2011 · 30f5a23 · 30f5a23
2 parents 588c45d + 9bf7fcc
commit 30f5a23
Show file tree

Hide file tree

Showing 5 changed files with 905 additions and 363 deletions.
diff --git a/libraries/phpmailer/language/phpmailer.lang-en.php b/libraries/phpmailer/language/phpmailer.lang-en.php
diff --git a/libraries/phpmailer/language/phpmailer.lang-joomla.php b/libraries/phpmailer/language/phpmailer.lang-joomla.php
@@ -7,22 +7,22 @@
 // no direct access
 defined('JPATH_PLATFORM') or die;
 
-$PHPMAILER_LANG["provide_address"] = JText::_('PHPMAILER_PROVIDE_ADDRESS');
-$PHPMAILER_LANG["mailer_not_supported"] = JText::_('PHPMAILER_MAILER_IS_NOT_SUPPORTED');
-$PHPMAILER_LANG["execute"] = JText::_('PHPMAILER_EXECUTE');
-$PHPMAILER_LANG["instantiate"] = JText::_('PHPMAILER_INSTANTIATE');
 $PHPMAILER_LANG["authenticate"] = JText::_('PHPMAILER_AUTHENTICATE');
-$PHPMAILER_LANG["from_failed"] = JText::_('PHPMAILER_FROM_FAILED');
-$PHPMAILER_LANG["recipients_failed"] = JText::_('PHPMAILER_RECIPIENTS_FAILED');
-$PHPMAILER_LANG["data_not_accepted"] = JText::_('PHPMAILER_DATA_NOT_ACCEPTED');
 $PHPMAILER_LANG["connect_host"] = JText::_('PHPMAILER_CONNECT_HOST');
+$PHPMAILER_LANG["data_not_accepted"] = JText::_('PHPMAILER_DATA_NOT_ACCEPTED');
+$PHPMAILER_LANG['empty_message'] = JText::_('PHPMAILER_EMPTY_MESSAGE');
+$PHPMAILER_LANG["encoding"] = JText::_('PHPMAILER_ENCODING');
+$PHPMAILER_LANG["execute"] = JText::_('PHPMAILER_EXECUTE');
 $PHPMAILER_LANG["file_access"] = JText::_('PHPMAILER_FILE_ACCESS');
 $PHPMAILER_LANG["file_open"] = JText::_('PHPMAILER_FILE_OPEN');
-$PHPMAILER_LANG["encoding"] = JText::_('PHPMAILER_ENCODING');
-$PHPMAILER_LANG["signing"]  = JText::_('PHPMAILER_SIGNING_ERROR');
-$PHPMAILER_LANG['smtp_error'] = JText::_('PHPMAILER_SMTP_ERROR');
-$PHPMAILER_LANG['empty_message'] = JText::_('PHPMAILER_EMPTY_MESSAGE');
+$PHPMAILER_LANG["from_failed"] = JText::_('PHPMAILER_FROM_FAILED');
+$PHPMAILER_LANG["instantiate"] = JText::_('PHPMAILER_INSTANTIATE');
 $PHPMAILER_LANG['invalid_address'] = JText::_('PHPMAILER_INVALID_ADDRESS');
-$PHPMAILER_LANG['variable_set'] = JText::_('PHPMAILER_VARIABLE_SET');
+$PHPMAILER_LANG["mailer_not_supported"] = JText::_('PHPMAILER_MAILER_IS_NOT_SUPPORTED');
+$PHPMAILER_LANG["provide_address"] = JText::_('PHPMAILER_PROVIDE_ADDRESS');
+$PHPMAILER_LANG["recipients_failed"] = JText::_('PHPMAILER_RECIPIENTS_FAILED');
+$PHPMAILER_LANG["signing"]  = JText::_('PHPMAILER_SIGNING_ERROR');
 $PHPMAILER_LANG['smtp_connect_failed'] = JText::_('PHPMAILER_SMTP_CONNECT_FAILED');
+$PHPMAILER_LANG['smtp_error'] = JText::_('PHPMAILER_SMTP_ERROR');
 $PHPMAILER_LANG['tls'] = JText::_('PHPMAILER_TLS');
+$PHPMAILER_LANG['variable_set'] = JText::_('PHPMAILER_VARIABLE_SET');