Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
typo3
qfq
Commits
be41d819
Commit
be41d819
authored
Mar 04, 2019
by
Carsten Rose
Browse files
B7978 / mail.log: not written in some cases - fixed
parent
6b02d3a4
Pipeline
#1672
failed with stage
in 2 minutes and 6 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
extension/Source/core/report/SendMail.php
View file @
be41d819
...
...
@@ -163,7 +163,7 @@ class SendMail {
$logFile
=
$this
->
store
->
getVar
(
SYSTEM_MAIL_LOG
,
STORE_SYSTEM
);
if
(
$logFile
!=
''
&&
$logFile
!==
false
)
{
$args
[]
=
'-l "'
.
$logFile
.
'"'
;
;
$args
[]
=
'-l "'
.
$logFile
.
'"'
;
}
if
(
!
empty
(
$mailConfig
[
SENDMAIL_TOKEN_RECEIVER_CC
]))
{
...
...
extension/Source/core/store/Store.php
View file @
be41d819
...
...
@@ -300,6 +300,14 @@ class Store {
$config
[
SYSTEM_SEND_E_MAIL
]
=
$config
[
SYSTEM_EXT_PATH
]
.
'/Source/external/sendEmail'
;
// Make path absolute
foreach
([
SYSTEM_MAIL_LOG
,
SYSTEM_QFQ_LOG
,
SYSTEM_SQL_LOG
]
AS
$key
)
{
if
(
!
empty
(
$config
[
$key
])
&&
$config
[
$key
][
0
]
!=
'/'
)
{
$config
[
$key
]
=
$config
[
SYSTEM_SITE_PATH
]
.
'/'
.
$config
[
$key
];
}
}
// In case the database credentials are given in the old style: copy them to the new style
if
(
!
isset
(
$config
[
SYSTEM_DB_1_USER
])
&&
isset
(
$config
[
SYSTEM_DB_USER
]))
{
$config
[
SYSTEM_DB_1_USER
]
=
$config
[
SYSTEM_DB_USER
];
...
...
@@ -685,7 +693,7 @@ class Store {
$len
=
strlen
(
SIP_PREFIX_BASE64
);
while
(
$useStores
!==
false
&&
$useStores
!==
''
)
{
while
(
$useStores
!==
false
&&
$useStores
!==
''
)
{
$store
=
$useStores
[
0
];
// current store
$finalKey
=
$key
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment