summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-10-26 13:20:34 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-10-26 13:20:34 +0000
commitb0b035843543dee720c31372098ddef505dd2d84 (patch)
tree4c7a40f0f9008bd530a59656f34b586bdab6d6b7 /roundcubemail/program
parent70844ad82ab8b94a71c32aac8490e70e65921691 (diff)
- Fix: don't return "empty" unlock
git-svn-id: https://svn.roundcube.net/trunk@4139 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/include/rcube_json_output.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/roundcubemail/program/include/rcube_json_output.php b/roundcubemail/program/include/rcube_json_output.php
index 1ad1ec56c..cd6b289b2 100644
--- a/roundcubemail/program/include/rcube_json_output.php
+++ b/roundcubemail/program/include/rcube_json_output.php
@@ -237,7 +237,11 @@ class rcube_json_output
unset($this->env['task'], $this->env['action'], $this->env['comm_path']);
$rcmail = rcmail::get_instance();
- $response = array('action' => $rcmail->action, 'unlock' => get_input_value('_unlock', RCUBE_INPUT_GPC));
+ $response['action'] = $rcmail->action;
+
+ if ($unlock = get_input_value('_unlock', RCUBE_INPUT_GPC)) {
+ $response['unlock'] = $unlock;
+ }
if (!empty($this->env))
$response['env'] = $this->env;