jenkins-bot has submitted this change and it was merged.
Change subject: Gave a new error message for !isValidTiff()
......................................................................
Gave a new error message for !isValidTiff()
The original error message was he uploaded file contains errors: $1,
without any parameters passed. Added a new message - tiff_invalid_file
Updated the qqq entry
Bug: 41318
Change-Id: Ib96a22752ce359cbde5bebe3c7121ad4ad360469
---
M PagedTiffHandler.i18n.php
M PagedTiffHandler_body.php
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
Mglaser: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/PagedTiffHandler.i18n.php b/PagedTiffHandler.i18n.php
index 37c5281..2735cf8 100644
--- a/PagedTiffHandler.i18n.php
+++ b/PagedTiffHandler.i18n.php
@@ -28,6 +28,7 @@
'tiff_size_error' => 'The reported file size does not match the actual
file size.',
'tiff_script_detected' => 'The uploaded file contains scripts.',
'tiff_bad_file' => 'The uploaded file contains errors: $1',
+ 'tiff_invalid_file' => 'The uploaded file is not a valid TIFF',
'tiff-file-info-size' => '$1 × $2 pixels, file size: $3, MIME type: $4,
$5 {{PLURAL:$5|page|pages}}',
);
@@ -49,6 +50,7 @@
'tiff_error_cached' => 'Error message shown when an error occurres and
it is cached.',
'tiff_size_error' => 'Error message shown when the reported file size
does not match the actual file size.',
'tiff_script_detected' => 'Error message shown when the uploaded file
contains scripts.',
+ 'tiff_invalid_file' => 'Error message shown when the uploaded file is
not a valid TIFF file.',
'tiff_bad_file' => 'Error message shown when the uploaded file contains
errors. First parameter contains error messages.
Parameters:
diff --git a/PagedTiffHandler_body.php b/PagedTiffHandler_body.php
index 85ec766..bf90838 100644
--- a/PagedTiffHandler_body.php
+++ b/PagedTiffHandler_body.php
@@ -61,7 +61,7 @@
$tr->check();
if ( !$tr->isValidTiff() ) {
wfDebug( __METHOD__ . ": bad file\n" );
- $status->fatal( 'tiff_bad_file' );
+ $status->fatal( 'tiff_invalid_file' );
} else {
if ( $tr->checkScriptAtEnd(
$wgTiffReaderCheckEofForJS ) ) {
wfDebug( __METHOD__ . ": script
detected\n" );
--
To view, visit https://gerrit.wikimedia.org/r/107039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib96a22752ce359cbde5bebe3c7121ad4ad360469
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/PagedTiffHandler
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
