From 62f79fc9d8223617fadc8660e8477cd44e1978f2 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 12 Jun 2016 13:13:34 +0200
Subject: [PATCH] Fix conflict in new_user_dialog and password_force_new_user
 settings (#5275)

---
 CHANGELOG                                   | 1 +
 plugins/new_user_dialog/new_user_dialog.php | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6617e128ee9..e4e1e3ad243 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,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
 -------------
diff --git a/plugins/new_user_dialog/new_user_dialog.php b/plugins/new_user_dialog/new_user_dialog.php
index 1cef6801094..936eca3a3a5 100644
--- a/plugins/new_user_dialog/new_user_dialog.php
+++ b/plugins/new_user_dialog/new_user_dialog.php
@@ -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 @@ function create_identity($p)
      */
     function render_page($p)
     {
-        if ($_SESSION['plugin.newuserdialog'] && $p['template'] == 'mail') {
+        if ($_SESSION['plugin.newuserdialog']) {
             $this->add_texts('localization');
 
             $rcmail           = rcmail::get_instance();