dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "[FileBackend] Reduce backend sync errors a bit by aborting operations more."
[lhc/web/wiklou.git]
/
thumb.php
diff --git
a/thumb.php
b/thumb.php
index
9cfdae4
..
8307b48
100644
(file)
--- a/
thumb.php
+++ b/
thumb.php
@@
-25,7
+25,7
@@
define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
if ( isset( $_SERVER['MW_COMPILED'] ) ) {
require( 'core/includes/WebStart.php' );
} else {
if ( isset( $_SERVER['MW_COMPILED'] ) ) {
require( 'core/includes/WebStart.php' );
} else {
- require(
dirname( __FILE__ )
. '/includes/WebStart.php' );
+ require(
__DIR__
. '/includes/WebStart.php' );
}
// Don't use fancy mime detection, just check the file extension for jpg/gif/png
}
// Don't use fancy mime detection, just check the file extension for jpg/gif/png
@@
-129,13
+129,13
@@
function wfStreamThumb( array $params ) {
// Format is <timestamp>!<name>
$bits = explode( '!', $fileName, 2 );
if ( count( $bits ) != 2 ) {
// Format is <timestamp>!<name>
$bits = explode( '!', $fileName, 2 );
if ( count( $bits ) != 2 ) {
- wfThumbError( 404, wfM
sg( 'badtitletext'
) );
+ wfThumbError( 404, wfM
essage( 'badtitletext' )->text(
) );
wfProfileOut( __METHOD__ );
return;
}
$title = Title::makeTitleSafe( NS_FILE, $bits[1] );
if ( !$title ) {
wfProfileOut( __METHOD__ );
return;
}
$title = Title::makeTitleSafe( NS_FILE, $bits[1] );
if ( !$title ) {
- wfThumbError( 404, wfM
sg( 'badtitletext'
) );
+ wfThumbError( 404, wfM
essage( 'badtitletext' )->text(
) );
wfProfileOut( __METHOD__ );
return;
}
wfProfileOut( __METHOD__ );
return;
}
@@
-147,7
+147,7
@@
function wfStreamThumb( array $params ) {
// Get the name without the timestamp so hash paths are correctly computed
$title = Title::makeTitleSafe( NS_FILE, isset( $bits[1] ) ? $bits[1] : $fileName );
if ( !$title ) {
// Get the name without the timestamp so hash paths are correctly computed
$title = Title::makeTitleSafe( NS_FILE, isset( $bits[1] ) ? $bits[1] : $fileName );
if ( !$title ) {
- wfThumbError( 404, wfM
sg( 'badtitletext'
) );
+ wfThumbError( 404, wfM
essage( 'badtitletext' )->text(
) );
wfProfileOut( __METHOD__ );
return;
}
wfProfileOut( __METHOD__ );
return;
}
@@
-172,7
+172,7
@@
function wfStreamThumb( array $params ) {
// Check the source file storage path
if ( !$img ) {
// Check the source file storage path
if ( !$img ) {
- wfThumbError( 404, wfM
sg( 'badtitletext'
) );
+ wfThumbError( 404, wfM
essage( 'badtitletext' )->text(
) );
wfProfileOut( __METHOD__ );
return;
}
wfProfileOut( __METHOD__ );
return;
}
@@
-243,15
+243,16
@@
function wfStreamThumb( array $params ) {
// Check for thumbnail generation errors...
$errorMsg = false;
// Check for thumbnail generation errors...
$errorMsg = false;
+ $msg = wfMessage( 'thumbnail_error' );
if ( !$thumb ) {
if ( !$thumb ) {
- $errorMsg =
wfMsgHtml( 'thumbnail_error', 'File::transform() returned false'
);
+ $errorMsg =
$msg->rawParams( 'File::transform() returned false' )->escaped(
);
} elseif ( $thumb->isError() ) {
$errorMsg = $thumb->getHtmlMsg();
} elseif ( !$thumb->hasFile() ) {
} elseif ( $thumb->isError() ) {
$errorMsg = $thumb->getHtmlMsg();
} elseif ( !$thumb->hasFile() ) {
- $errorMsg =
wfMsgHtml( 'thumbnail_error', 'No path supplied in thumbnail object'
);
+ $errorMsg =
$msg->rawParams( 'No path supplied in thumbnail object' )->escaped(
);
} elseif ( $thumb->fileIsSource() ) {
} elseif ( $thumb->fileIsSource() ) {
- $errorMsg =
wfMsgHtml( 'thumbnail_error',
-
'Image was not scaled, is the requested width bigger than the source?'
);
+ $errorMsg =
$msg->
+
rawParams( 'Image was not scaled, is the requested width bigger than the source?' )->escaped(
);
}
if ( $errorMsg !== false ) {
}
if ( $errorMsg !== false ) {