summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-06-30 12:33:07 +0200
committerAleksander Machniak <alec@alec.pl>2014-06-30 12:33:07 +0200
commit5312b71126c0d1286a2d1c0788dd2636679a1746 (patch)
tree548a1b7bcd2e4dd8eeba95dd3cbfd81ee17b79d6 /program/include
parentb8bcca7033b3d10eb7da4b7a1f9987ee9e25a45b (diff)
Allways return current folder from quota_content()
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcmail.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index b105eb892..ed5fedb4a 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1684,7 +1684,8 @@ class rcmail extends rcube
$quota = $this->plugins->exec_hook('quota', $quota);
$quota_result = (array) $quota;
- $quota_result['type'] = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';
+ $quota_result['type'] = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';
+ $quota_result['folder'] = $folder !== null && $folder !== '' ? $folder : 'INBOX';
if ($quota['total'] > 0) {
if (!isset($quota['percent'])) {
@@ -1748,10 +1749,6 @@ class rcmail extends rcube
unset($quota_result['all']);
}
- if ($folder !== null && $folder !== '') {
- $quota_result['folder'] = $folder;
- }
-
return $quota_result;
}