Fix conflict in new_user_dialog and password_force_new_user settings (#5275)

pull/5268/merge
Aleksander Machniak 8 years ago
parent 3dd83804b4
commit 2c30feece1

@ -33,6 +33,7 @@ CHANGELOG Roundcube Webmail
- Fix so upgrade script makes sure program/lib directory does not contain old libraries (#5287)
- Fix subscription checkbox state on error in folder subscribe/unsubscribe action (#5243)
- Fix bug where microsecond format in logged date didn't work in some cases
- Fix conflict in new_user_dialog and password_force_new_user settings (#5275)
RELEASE 1.2.0
-------------

@ -14,9 +14,10 @@
*/
class new_user_dialog extends rcube_plugin
{
public $task = 'login|mail';
public $task = '';
public $noframe = true;
function init()
{
$this->add_hook('identity_create', array($this, 'create_identity'));
@ -45,7 +46,7 @@ class new_user_dialog extends rcube_plugin
*/
function render_page($p)
{
if ($_SESSION['plugin.newuserdialog'] && $p['template'] == 'mail') {
if ($_SESSION['plugin.newuserdialog']) {
$this->add_texts('localization');
$rcmail = rcmail::get_instance();

Loading…
Cancel
Save