summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-03-10 11:49:20 +0100
committerAleksander Machniak <alec@alec.pl>2013-03-10 11:49:20 +0100
commit8b771646fadcde0abb27c2218a45942b95734838 (patch)
tree8c438cdc684cac4a0c03c123a7eb2e2fc2026ca2 /program/js
parent507876cf038f87953702e34596d14d7f57666ccd (diff)
Fix so task name can really contain all from a-z0-9_- characters (#1488941)
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/program/js/app.js b/program/js/app.js
index c2a7c1b79..9f76757a6 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1235,7 +1235,7 @@ function rcube_webmail()
if (!url)
url = this.env.comm_path;
- return url.replace(/_task=[a-z]+/, '_task='+task);
+ return url.replace(/_task=[a-z0-9_-]+/i, '_task='+task);
};
this.reload = function(delay)
@@ -5970,9 +5970,9 @@ function rcube_webmail()
var base = this.env.comm_path, k, param = {};
// overwrite task name
- if (query._action.match(/([a-z]+)\/([a-z0-9-_.]+)/)) {
+ if (query._action.match(/([a-z0-9_-]+)\/([a-z0-9-_.]+)/)) {
query._action = RegExp.$2;
- base = base.replace(/\_task=[a-z]+/, '_task='+RegExp.$1);
+ base = base.replace(/\_task=[a-z0-9_-]+/, '_task='+RegExp.$1);
}
// remove undefined values