From db3a14b405c926e14ffb36d73fb3759fce35fe61 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 13 Apr 2014 03:05:44 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/js/app.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 7191c02..a0b9533 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -6829,13 +6829,13 @@
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);
}
--
Gitblit v1.9.1