Merge branch 'htmlmail'

* htmlmail: (26 commits)
  changed internal Mailer members from private to protected
  made it possible to disable HTML mails in the config
  removed commented code left from the quoted_printable days
  add missing table tags for HTML diff mails
  fixed subscriber mail signatures
  use real HRs in HTML mails
  Add various headers to the mails FS#2247. pull request #83 closed
  removed footer image from HTML mails
  use inlinestyles for diffs in HTML mails
  fixed signature stripping
  fixed mailprefix handling
  fixed missing replacement for HTML notify mails
  allow image embeds in HTML mail templates
  Added HTML wrapper for mails
  allow non-txt extensions when accessing locales
  added Mailer class to autoloader
  Replaced mail_send calls with new Mailer class
  Make use of new Mailer class in notify()
  Copy all text replacements to HTML replacements in Mailer
  Added setBody() to Mailer class
  ...

2 files changed, 2 insertions, 0 deletions

diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 42f34de74..d588e02f8 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -147,6 +147,7 @@ $lang['notify']      = 'Always send change notifications to this email address';
 $lang['registernotify'] = 'Always send info on newly registered users to this email address';
 $lang['mailfrom']    = 'Sender email address to use for automatic mails';
 $lang['mailprefix']  = 'Email subject prefix to use for automatic mails. Leave blank to use the wiki title';
+$lang['htmlmail']    = 'Send better looking, but larger in size HTML multipart emails. Disable for plain text only mails.';
 
 /* Syndication Settings */
 $lang['sitemap']     = 'Generate Google sitemap this often (in days). 0 to disable';
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index e610ac4d4..997495b2e 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -177,6 +177,7 @@ $meta['notify']         = array('email', '_multiple' => true);
 $meta['registernotify'] = array('email');
 $meta['mailfrom']       = array('richemail');
 $meta['mailprefix']     = array('string');
+$meta['htmlmail']       = array('onoff');
 
 $meta['_syndication'] = array('fieldset');
 $meta['sitemap']     = array('numeric');