espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/7.0.9'

Browse Source
This commit is contained in:
Yuri Kuznetsov
2021-12-30 15:40:33 +02:00
parent 79c4a8351d 150e41a26d
commit 4ebdcf3637
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Services/EmailAccount.php
+1 -1
View File
@@ -377,7 +377,7 @@ class EmailAccount extends Record implements
}
foreach ($monitoredFolders as $folder) {
$folder = mb_convert_encoding(trim($folder), 'UTF7-IMAP', 'UTF-8');
$folder = mb_convert_encoding($folder, 'UTF7-IMAP', 'UTF-8');
$portionLimit = $this->getConfig()->get('personalEmailMaxPortionSize', self::PORTION_LIMIT);
application/Espo/Services/InboundEmail.php
+1 -1
View File
@@ -268,7 +268,7 @@ class InboundEmail extends RecordService implements
}
foreach ($monitoredFolders as $folder) {
$folder = mb_convert_encoding(trim($folder), 'UTF7-IMAP', 'UTF-8');
$folder = mb_convert_encoding($folder, 'UTF7-IMAP', 'UTF-8');
$portionLimit = $this->config->get('inboundEmailMaxPortionSize', self::PORTION_LIMIT);
client/src/views/notification/badge.js
+5 -2
View File
@@ -158,11 +158,14 @@ define('views/notification/badge', 'view', function (Dep) {
},
checkBypass: function () {
var last = this.getRouter().getLast() || {};
let last = this.getRouter().getLast() || {};
let pageAction = (last.options || {}).page || null;
if (
last.controller === 'Admin' &&
~['upgrade', 'extensions'].indexOf(last.action)
last.action === 'page' &&
~['upgrade', 'extensions'].indexOf(pageAction)
) {
return true;
}