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
ef07e9f1
Commit
ef07e9f1
authored
Nov 29, 2019
by
Carsten Rose
Browse files
Download / PDF merge: skip leading errors, interpret only 'Could not merge encrypted files'
parent
d504da63
Pipeline
#2820
passed with stages
in 2 minutes and 47 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
extension/Classes/Core/Report/Download.php
View file @
ef07e9f1
...
...
@@ -188,7 +188,7 @@ class Download {
// Possible output: "Unimplemented Feature: Could not merge encrypted files ('ct.18.06.092-097.pdf')"
$line
=
implode
(
','
,
$rcOutput
);
if
(
false
!==
strstr
(
$line
,
"Unimplemented Feature: Could not merge encrypted files ("
))
{
if
(
false
!==
(
$line
=
strstr
(
$line
,
"Unimplemented Feature: Could not merge encrypted files ("
))
)
{
$arr
=
explode
(
"'"
,
$line
,
3
);
if
(
!
empty
(
$arr
[
1
])
&&
file_exists
(
$arr
[
1
]))
{
...
...
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