Fix handling of identities_level=4

pull/68/head
Aleksander Machniak 11 years ago
parent 0c896b9879
commit 2964fb573d

@ -126,7 +126,7 @@ class new_user_dialog extends rcube_plugin
);
// don't let the user alter the e-mail address if disabled by config
if ($identities_level == 1 || $identities_level == 3)
if (in_array($identities_level, array(1,3,4)))
$save_data['email'] = $identity['email'];
else
$save_data['email'] = rcube_utils::idn_to_ascii($save_data['email']);
@ -141,5 +141,3 @@ class new_user_dialog extends rcube_plugin
}
}
?>

@ -13,10 +13,9 @@
<email>roundcube@gmail.com</email>
<active>yes</active>
</lead>
<date>2012-01-16</date>
<time>17:00</time>
<date>2013-04-16</date>
<version>
<release>1.5</release>
<release>1.6</release>
<api>1.0</api>
</version>
<stability>
@ -25,8 +24,7 @@
</stability>
<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
<notes>
- Use jquery UI to render the dialog
- Fixed IDNA encoding/decoding of e-mail addresses (#1487909)
- Fix handling of identities_level=4
</notes>
<contents>
<dir baseinstalldir="/" name="/">
@ -150,5 +148,22 @@
<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
<notes>- Use jquery UI to render the dialog</notes>
</release>
<release>
<date>2012-01-16</date>
<time>17:00</time>
<version>
<release>1.5</release>
<api>1.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
<notes>
- Use jquery UI to render the dialog
- Fixed IDNA encoding/decoding of e-mail addresses (#1487909)
</notes>
</release>
</changelog>
</package>

Loading…
Cancel
Save