Skip to content

Commit a02cc28

Browse files
Merge branch 'master' of github.com:freescout-helpdesk/freescout into dist
2 parents 53f6100 + 1426336 commit a02cc28

File tree

4 files changed

+654
-7
lines changed

4 files changed

+654
-7
lines changed

app/Misc/Helper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ public static function decrypt($value, $password = null, $force_unserialize = fa
900900

901901
// If the value is scalar - unserialize it,
902902
// Otherwise - do not, as objects may contain dangerous code.
903-
if (!preg_match("^[dsa]:", $value) || $force_unserialize) {
903+
if (!preg_match("^[idsa]:", $value) || $force_unserialize) {
904904
$value = unserialize($value);
905905
}
906906
} catch (\Exception $e) {

app/Misc/Mail.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,11 @@ public static function imapUtf8($mime_encoded_text)
728728

729729
public static function getHeader($headers_str, $header)
730730
{
731+
// Quick check to same resources.
732+
if (!stristr($headers_str, $header)) {
733+
return '';
734+
}
735+
731736
$header = strtolower($header);
732737
$header = str_replace('-', '_', $header);
733738

config/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
| or any other location as required by the application or its packages.
1919
*/
2020

21-
'version' => '1.8.186',
21+
'version' => '1.8.187',
2222

2323
/*
2424
|--------------------------------------------------------------------------

0 commit comments

Comments
 (0)