Skip to content

Commit

Permalink
Merge branch 'master' of github.com:freescout-helpdesk/freescout into…
Browse files Browse the repository at this point in the history
… dist
  • Loading branch information
freescout-helpdesk committed Apr 12, 2024
2 parents 26756cc + db84078 commit 0dbdf40
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Mobile apps support the same functionality and modules as the web version of you
FreeScout is a pure PHP/MySQL application, so it can be easily deployed even on a shared hosting.

* Nginx / Apache / IIS
* PHP 7.1 - 8.2
* PHP 7.1 - 8.x
* MySQL 5.0+ / MariaDB 5.0+ / PostgreSQL

There is no minimum system requirements (CPU / RAM) – FreeScout will run on any system.
Expand Down
2 changes: 1 addition & 1 deletion config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
| or any other location as required by the application or its packages.
*/

'version' => '1.8.133',
'version' => '1.8.134',

/*
|--------------------------------------------------------------------------
Expand Down
10 changes: 5 additions & 5 deletions overrides/webklex/php-imap/src/Attachment.php
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,9 @@ protected function fetch() {
$this->filename = $this->decodeName($filename);
}

if (($description = $this->part->description) !== null) {
$this->description = $this->part->getHeader()->decode($description);
}
// if (($description = $this->part->description) !== null) {
// $this->description = $this->part->getHeader()->decode($description);
// }

if (($name = $this->part->name) !== null) {
$this->name = $this->decodeName($name);
Expand All @@ -270,10 +270,10 @@ protected function fetch() {
if (IMAP::ATTACHMENT_TYPE_MESSAGE == $this->part->type) {
if ($this->part->ifdescription) {
if (!$this->name) {
$this->name = $this->part->description;
$this->name = $this->decodeName($this->part->description);
}
} else if (!$this->name) {
$this->name = $this->part->subtype;
$this->name = $this->decodeName(($this->part->subtype);
}
}
$this->attributes = array_merge($this->part->getHeader()->getAttributes(), $this->attributes);
Expand Down

0 comments on commit 0dbdf40

Please sign in to comment.