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 "upload: Simplify file extension extraction in UploadBase"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiFormatBase.php
diff --git
a/includes/api/ApiFormatBase.php
b/includes/api/ApiFormatBase.php
index
e033525
..
bff9fd0
100644
(file)
--- a/
includes/api/ApiFormatBase.php
+++ b/
includes/api/ApiFormatBase.php
@@
-158,11
+158,9
@@
abstract class ApiFormatBase extends ApiBase {
if ( !is_array( $paramSettings ) ) {
return $paramSettings;
if ( !is_array( $paramSettings ) ) {
return $paramSettings;
- } elseif ( isset( $paramSettings[self::PARAM_DFLT] ) ) {
- return $paramSettings[self::PARAM_DFLT];
- } else {
- return null;
}
}
+
+ return $paramSettings[self::PARAM_DFLT] ?? null;
}
/**
}
/**