summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-04-13 09:05:44 +0200
committerAleksander Machniak <alec@alec.pl>2014-04-13 09:05:44 +0200
commitdb3a14b405c926e14ffb36d73fb3759fce35fe61 (patch)
tree21f8ec6ace86def82a3e8a2e99c3ee1bd1796bfd
parentcb29c97bf6cb5bbe79b17e7524a6042000f1a101 (diff)
parent14423c867c593e2a73dc8154bc3c45c0e63a766c (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
-rw-r--r--program/js/app.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 7191c0215..a0b953386 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -6829,13 +6829,13 @@ function rcube_webmail()
if (action)
query._action = action;
- else
+ else if (this.env.action)
query._action = this.env.action;
var base = this.env.comm_path, k, param = {};
// overwrite task name
- if (query._action.match(/([a-z0-9_-]+)\/([a-z0-9-_.]+)/)) {
+ if (action && action.match(/([a-z0-9_-]+)\/([a-z0-9-_.]+)/)) {
query._action = RegExp.$2;
base = base.replace(/\_task=[a-z0-9_-]+/, '_task='+RegExp.$1);
}