summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-05-13 17:31:09 +0000
committeralecpl <alec@alec.pl>2011-05-13 17:31:09 +0000
commitbff88dcb94a95d53ac37d8ac3c2b86f512b5869a (patch)
tree7505d48cb671fd1dd0f27e0db8c1e79eee6bacbf /plugins
parentba9c7b40f0dfcadf1d5711246e7b332ff7a60787 (diff)
- Apply fixes from trunk (up to r4756)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/new_user_dialog/new_user_dialog.php4
-rw-r--r--plugins/new_user_dialog/package.xml26
2 files changed, 23 insertions, 7 deletions
diff --git a/plugins/new_user_dialog/new_user_dialog.php b/plugins/new_user_dialog/new_user_dialog.php
index 96cd0da23..c537b9b86 100644
--- a/plugins/new_user_dialog/new_user_dialog.php
+++ b/plugins/new_user_dialog/new_user_dialog.php
@@ -62,7 +62,7 @@ class new_user_dialog extends rcube_plugin
$table->add(null, html::tag('input', array(
'type' => 'text',
'name' => '_email',
- 'value' => idn_to_utf8($identity['email']),
+ 'value' => rcube_idn_to_utf8($identity['email']),
'disabled' => ($identities_level == 1 || $identities_level == 3)
)));
@@ -113,7 +113,7 @@ class new_user_dialog extends rcube_plugin
if ($identities_level == 1 || $identities_level == 3)
$save_data['email'] = $identity['email'];
else
- $save_data['email'] = idn_to_ascii($save_data['email']);
+ $save_data['email'] = rcube_idn_to_ascii($save_data['email']);
// save data if not empty
if (!empty($save_data['name']) && !empty($save_data['email'])) {
diff --git a/plugins/new_user_dialog/package.xml b/plugins/new_user_dialog/package.xml
index 198a9fadb..52874701f 100644
--- a/plugins/new_user_dialog/package.xml
+++ b/plugins/new_user_dialog/package.xml
@@ -13,10 +13,10 @@
<email>roundcube@gmail.com</email>
<active>yes</active>
</lead>
- <date>2010-12-02</date>
- <time>12:00:00</time>
+ <date>2011-05-12</date>
+ <time>10:00</time>
<version>
- <release>1.3</release>
+ <release>1.4</release>
<api>1.0</api>
</version>
<stability>
@@ -25,8 +25,7 @@
</stability>
<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
<notes>
-- Added setting of focus on name input
-- Added gl_ES translation
+- Fixed IDNA encoding/decoding of e-mail addresses (#1487909)
</notes>
<contents>
<dir baseinstalldir="/" name="/">
@@ -119,5 +118,22 @@
- Fix possible error on form submission (#1486103)
</notes>
</release>
+ <release>
+ <date>2010-12-02</date>
+ <time>12:00:00</time>
+ <version>
+ <release>1.3</release>
+ <api>1.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
+ <notes>
+- Added setting of focus on name input
+- Added gl_ES translation
+ </notes>
+ </release>
</changelog>
</package>