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 "jquery.lengthLimit: Fix 'cut'/'paste' event handling"
[lhc/web/wiklou.git]
/
thumb.php
diff --git
a/thumb.php
b/thumb.php
index
c4b40dc
..
a3c9d84
100644
(file)
--- a/
thumb.php
+++ b/
thumb.php
@@
-35,7
+35,7
@@
if ( defined( 'THUMB_HANDLER' ) ) {
wfThumbHandle404();
} else {
// Called directly, use $_GET params
wfThumbHandle404();
} else {
// Called directly, use $_GET params
- wfStreamThumb( $
_GET
);
+ wfStreamThumb( $
wgRequest->getQueryValues()
);
}
$mediawiki = new MediaWiki();
}
$mediawiki = new MediaWiki();
@@
-235,9
+235,9
@@
function wfStreamThumb( array $params ) {
// Fix IE brokenness
$imsString = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
// Calculate time
// Fix IE brokenness
$imsString = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
// Calculate time
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$imsUnix = strtotime( $imsString );
$imsUnix = strtotime( $imsString );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
if ( wfTimestamp( TS_UNIX, $img->getTimestamp() ) <= $imsUnix ) {
HttpStatus::header( 304 );
return;
if ( wfTimestamp( TS_UNIX, $img->getTimestamp() ) <= $imsUnix ) {
HttpStatus::header( 304 );
return;