diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-09-22 08:48:05 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-09-22 08:48:05 +0000 |
| commit | a2ec9d5618db0a6db49cbc00217e21d7f44c3958 (patch) | |
| tree | 25581944875f86f728351a86f780025fb0397555 | |
| parent | 51bffd16f124e26c232a192c852a05f795a171ce (diff) | |
Fix compose command from other tasks than mail and address book; skip common request parameters
git-svn-id: https://svn.roundcube.net/trunk@5267 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/include/main.inc | 5 | ||||
| -rw-r--r-- | roundcubemail/program/js/app.js | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index 28556df5e..226fa8a5d 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/program/include/main.inc @@ -705,13 +705,14 @@ function parse_input_value($value, $allow_html=FALSE, $charset=NULL) * @param int Source to get value from (GPC) * @return array Hash array with all request parameters */ -function request2param($mode = RCUBE_INPUT_GPC) +function request2param($mode = RCUBE_INPUT_GPC, $ignore = 'task|action') { $out = array(); $src = $mode == RCUBE_INPUT_GET ? $_GET : ($mode == RCUBE_INPUT_POST ? $_POST : $_REQUEST); foreach ($src as $key => $value) { $fname = $key[0] == '_' ? substr($key, 1) : $key; - $out[$fname] = get_input_value($key, $mode); + if ($ignore && !preg_match("/($ignore)/", $fname)) + $out[$fname] = get_input_value($key, $mode); } return $out; diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js index a9fbe987d..6acb48d86 100644 --- a/roundcubemail/program/js/app.js +++ b/roundcubemail/program/js/app.js @@ -847,6 +847,8 @@ function rcube_webmail() break; } + else if (props) + url += '&_to='+urlencode(props); this.redirect(url); break; |