summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-04-12 19:59:10 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-04-12 19:59:10 +0200
commit14423c867c593e2a73dc8154bc3c45c0e63a766c (patch)
tree12c11aeccd74da4232ed8732961e0186fd3a6f26 /program/js
parent47fccf4fa667bb9caac0ee093df0fa8375b0db82 (diff)
Avoid empty _action= parameters in URLs
Diffstat (limited to 'program/js')
-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);
}