From 11bcac5802dbdd01ee37b97e84f9a91c5777d9e6 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 29 Sep 2010 09:32:41 -0400
Subject: [PATCH] - Fix HTML to plain text conversion doesn't handle citation blocks (#1486921)
---
program/include/rcube_config.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 36892c0..8020c39 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -274,10 +274,11 @@
/**
* Return the mail domain configured for the given host
*
- * @param string IMAP host
+ * @param string IMAP host
+ * @param boolean If true, domain name will be converted to IDN ASCII
* @return string Resolved SMTP host
*/
- public function mail_domain($host)
+ public function mail_domain($host, $encode=true)
{
$domain = $host;
@@ -288,6 +289,9 @@
else if (!empty($this->prop['mail_domain']))
$domain = rcube_parse_host($this->prop['mail_domain']);
+ if ($encode)
+ $domain = idn_to_ascii($domain);
+
return $domain;
}
--
Gitblit v1.9.1