- Merge r6012 from trunk

3 files changed, 3 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 2410aa304..2b6a3b7c0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix lack of warning when switching task in compose window (#1488399)
 - Fix bug where it wasn't possible to enter ( or & characters in autocomplete fields
 - Fix counting of messages search results (on refresh when search filter is in use)
 
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index ea221767c..b4f6e9be5 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -916,7 +916,7 @@ class rcube_template extends rcube_html_page
             // make valid href to specific buttons
             if (in_array($attrib['command'], rcmail::$main_tasks)) {
                 $attrib['href'] = rcmail_url(null, null, $attrib['command']);
-                $attrib['onclick'] = sprintf("%s.switch_task('%s');return false", JS_OBJECT_NAME, $attrib['command']);
+                $attrib['onclick'] = sprintf("%s.command('switch-task','%s');return false", JS_OBJECT_NAME, $attrib['command']);
             }
             else if ($attrib['task'] && in_array($attrib['task'], rcmail::$main_tasks)) {
                 $attrib['href'] = rcmail_url($attrib['command'], null, $attrib['task']);
diff --git a/program/js/app.js b/program/js/app.js
index e01b72aa2..28146392f 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -171,7 +171,7 @@ function rcube_webmail()
     }
 
     // enable general commands
-    this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', true);
+    this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'switch-task', true);
 
     if (this.env.permaurl)
       this.enable_command('permaurl', true);