diff options
| author | Bartosz Dziewoński <matma.rex@gmail.com> | 2017-10-07 00:17:58 +0200 |
|---|---|---|
| committer | James D. Forrester <jforrester@wikimedia.org> | 2018-05-30 18:06:13 -0700 |
| commit | 485f66f1744fea056e20a5bef619989bf1749202 (patch) | |
| tree | 10f1fa9496adf8a6057e28138c941bb2671fbeec /thumb.php | |
| parent | b191e5e860f24e1dd05e3d3d782364e4ea75b176 (diff) | |
| download | mediawikicore-485f66f1744fea056e20a5bef619989bf1749202.tar.gz mediawikicore-485f66f1744fea056e20a5bef619989bf1749202.zip | |
Use PHP 7 '??' operator instead of '?:' with 'isset()' where convenient
Find: /isset\(\s*([^()]+?)\s*\)\s*\?\s*\1\s*:\s*/
Replace with: '\1 ?? '
(Everywhere except includes/PHPVersionCheck.php)
(Then, manually fix some line length and indentation issues)
Then manually reviewed the replacements for cases where confusing
operator precedence would result in incorrect results
(fixing those in I478db046a1cc162c6767003ce45c9b56270f3372).
Change-Id: I33b421c8cb11cdd4ce896488c9ff5313f03a38cf
Diffstat (limited to 'thumb.php')
| -rw-r--r-- | thumb.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/thumb.php b/thumb.php index a3c9d84452c3..b59116eaed38 100644 --- a/thumb.php +++ b/thumb.php @@ -94,7 +94,7 @@ function wfStreamThumb( array $params ) { $headers = []; // HTTP headers to send - $fileName = isset( $params['f'] ) ? $params['f'] : ''; + $fileName = $params['f'] ?? ''; // Backwards compatibility parameters if ( isset( $params['w'] ) ) { @@ -244,7 +244,7 @@ function wfStreamThumb( array $params ) { } } - $rel404 = isset( $params['rel404'] ) ? $params['rel404'] : null; + $rel404 = $params['rel404'] ?? null; unset( $params['r'] ); // ignore 'r' because we unconditionally pass File::RENDER unset( $params['f'] ); // We're done with 'f' parameter. unset( $params['rel404'] ); // moved to $rel404 @@ -648,7 +648,7 @@ function wfThumbError( $status, $msgHtml, $msgText = null, $context = [] ) { if ( $wgShowHostnames ) { header( 'X-MW-Thumbnail-Renderer: ' . wfHostname() ); $url = htmlspecialchars( - isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : '', + $_SERVER['REQUEST_URI'] ?? '', ENT_NOQUOTES ); $hostname = htmlspecialchars( wfHostname(), ENT_NOQUOTES ); |