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 "redis: Fix incomplete @var documentation in RedisConnRef"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiUpload.php
diff --git
a/includes/api/ApiUpload.php
b/includes/api/ApiUpload.php
index
93e432b
..
2c5b583
100644
(file)
--- a/
includes/api/ApiUpload.php
+++ b/
includes/api/ApiUpload.php
@@
-682,9
+682,7
@@
class ApiUpload extends ApiBase {
$warning = $warnings['exists'];
unset( $warnings['exists'] );
/** @var LocalFile $localFile */
$warning = $warnings['exists'];
unset( $warnings['exists'] );
/** @var LocalFile $localFile */
- $localFile = isset( $warning['normalizedFile'] )
- ? $warning['normalizedFile']
- : $warning['file'];
+ $localFile = $warning['normalizedFile'] ?? $warning['file'];
$warnings[$warning['warning']] = $localFile->getName();
}
$warnings[$warning['warning']] = $localFile->getName();
}