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
Improve redis connection error log
[lhc/web/wiklou.git]
/
thumb.php
diff --git
a/thumb.php
b/thumb.php
index
913adc1
..
ad5239e
100644
(file)
--- a/
thumb.php
+++ b/
thumb.php
@@
-107,6
+107,15
@@
function wfStreamThumb( array $params ) {
$fileName = isset( $params['f'] ) ? $params['f'] : '';
$fileName = isset( $params['f'] ) ? $params['f'] : '';
+ // Backwards compatibility parameters
+ if ( isset( $params['w'] ) ) {
+ $params['width'] = $params['w'];
+ unset( $params['w'] );
+ }
+ if ( isset( $params['p'] ) ) {
+ $params['page'] = $params['p'];
+ }
+
// Is this a thumb of an archived file?
$isOld = ( isset( $params['archived'] ) && $params['archived'] );
unset( $params['archived'] ); // handlers don't care
// Is this a thumb of an archived file?
$isOld = ( isset( $params['archived'] ) && $params['archived'] );
unset( $params['archived'] ); // handlers don't care
@@
-171,7
+180,6
@@
function wfStreamThumb( array $params ) {
return;
}
return;
}
-
// Check the source file storage path
if ( !$img->exists() ) {
$redirectedLocation = false;
// Check the source file storage path
if ( !$img->exists() ) {
$redirectedLocation = false;
@@
-235,18
+243,9
@@
function wfStreamThumb( array $params ) {
}
}
}
}
- // Backwards compatibility parameters
- if ( isset( $params['w'] ) ) {
- $params['width'] = $params['w'];
- unset( $params['w'] );
- }
- if ( isset( $params['p'] ) ) {
- $params['page'] = $params['p'];
- }
unset( $params['r'] ); // ignore 'r' because we unconditionally pass File::RENDER
unset( $params['f'] ); // We're done with 'f' parameter.
unset( $params['r'] ); // ignore 'r' because we unconditionally pass File::RENDER
unset( $params['f'] ); // We're done with 'f' parameter.
-
// Get the normalized thumbnail name from the parameters...
try {
$thumbName = $img->thumbName( $params );
// Get the normalized thumbnail name from the parameters...
try {
$thumbName = $img->thumbName( $params );