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
Updated r86144 code due to reverts in r96889 (specifically of Parser.php change in...
[lhc/web/wiklou.git]
/
thumb.php
diff --git
a/thumb.php
b/thumb.php
index
30b6159
..
61fd788
100644
(file)
--- a/
thumb.php
+++ b/
thumb.php
@@
-7,12
+7,14
@@
* @ingroup Media
*/
define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
* @ingroup Media
*/
define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
-require_once( './includes/WebStart.php' );
+if ( isset( $_SERVER['MW_COMPILED'] ) ) {
+ require ( 'phase3/includes/WebStart.php' );
+} else {
+ require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
+}
$wgTrivialMimeDetection = true; //don't use fancy mime detection, just check the file extension for jpg/gif/png.
$wgTrivialMimeDetection = true; //don't use fancy mime detection, just check the file extension for jpg/gif/png.
-require_once( "$IP/includes/StreamFile.php" );
-
wfThumbMain();
wfLogProfilingData();
wfThumbMain();
wfLogProfilingData();
@@
-122,7
+124,7
@@
function wfThumbMain() {
$thumbPath = $img->getThumbPath( $thumbName );
if ( is_file( $thumbPath ) ) {
$thumbPath = $img->getThumbPath( $thumbName );
if ( is_file( $thumbPath ) ) {
-
wfStreamFile
( $thumbPath, $headers );
+
StreamFile::stream
( $thumbPath, $headers );
wfProfileOut( __METHOD__ );
return;
}
wfProfileOut( __METHOD__ );
return;
}
@@
-151,7
+153,7
@@
function wfThumbMain() {
$errorMsg = wfMsgHtml( 'thumbnail_error', 'Image was not scaled, ' .
'is the requested width bigger than the source?' );
} else {
$errorMsg = wfMsgHtml( 'thumbnail_error', 'Image was not scaled, ' .
'is the requested width bigger than the source?' );
} else {
-
wfStreamFile
( $thumb->getPath(), $headers );
+
StreamFile::stream
( $thumb->getPath(), $headers );
}
if ( $errorMsg !== false ) {
wfThumbError( 500, $errorMsg );
}
if ( $errorMsg !== false ) {
wfThumbError( 500, $errorMsg );