From df2188d778cb9bd89ca118c03850ef7f9fc86ce7 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 04 Oct 2010 02:52:12 -0400
Subject: [PATCH] - Fix mailto optional params in plain text messages aren't handled (#1487026)
---
program/include/rcube_template.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 4dcabb9..d923c64 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -994,15 +994,19 @@
return $username;
}
+ // Current username is an e-mail address
+ if (strpos($_SESSION['username'], '@')) {
+ $username = $_SESSION['username'];
+ }
// get e-mail address from default identity
- if ($sql_arr = $this->app->user->get_identity()) {
+ else if ($sql_arr = $this->app->user->get_identity()) {
$username = $sql_arr['email'];
}
else {
$username = $this->app->user->get_username();
}
- return $username;
+ return idn_to_utf8($username);
}
--
Gitblit v1.9.1