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 "rdbms: improve database connection loss handling"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialUploadStash.php
diff --git
a/includes/specials/SpecialUploadStash.php
b/includes/specials/SpecialUploadStash.php
index
2da9a41
..
4d0c20c
100644
(file)
--- a/
includes/specials/SpecialUploadStash.php
+++ b/
includes/specials/SpecialUploadStash.php
@@
-165,8
+165,6
@@
class SpecialUploadStash extends UnlistedSpecialPage {
*
* @param File $file
* @param array $params
*
* @param File $file
* @param array $params
- *
- * @return bool Success
*/
private function outputThumbFromStash( $file, $params ) {
$flags = 0;
*/
private function outputThumbFromStash( $file, $params ) {
$flags = 0;
@@
-263,7
+261,8
@@
class SpecialUploadStash extends UnlistedSpecialPage {
$scalerThumbUrl = $scalerBaseUrl . '/' . $file->getUrlRel() .
'/' . rawurlencode( $scalerThumbName );
$scalerThumbUrl = $scalerBaseUrl . '/' . $file->getUrlRel() .
'/' . rawurlencode( $scalerThumbName );
- // make a curl call to the scaler to create a thumbnail
+ // make an http request based on wgUploadStashScalerBaseUrl to lazy-create
+ // a thumbnail
$httpOptions = [
'method' => 'GET',
'timeout' => 5 // T90599 attempt to time out cleanly
$httpOptions = [
'method' => 'GET',
'timeout' => 5 // T90599 attempt to time out cleanly