From 5312b71126c0d1286a2d1c0788dd2636679a1746 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 30 Jun 2014 06:33:07 -0400
Subject: [PATCH] Allways return current folder from quota_content()
---
program/include/rcmail.php | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index b105eb8..ed5fedb 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1684,7 +1684,8 @@
$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'])) {
@@ -1746,10 +1747,6 @@
unset($quota_result['abort']);
if (empty($quota_result['table'])) {
unset($quota_result['all']);
- }
-
- if ($folder !== null && $folder !== '') {
- $quota_result['folder'] = $folder;
}
return $quota_result;
--
Gitblit v1.9.1