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 "OutputPage: Load html5shiv without indirection of load.php"
[lhc/web/wiklou.git]
/
includes
/
filerepo
/
file
/
ForeignAPIFile.php
diff --git
a/includes/filerepo/file/ForeignAPIFile.php
b/includes/filerepo/file/ForeignAPIFile.php
index
c49810c
..
ab8ef2f
100644
(file)
--- a/
includes/filerepo/file/ForeignAPIFile.php
+++ b/
includes/filerepo/file/ForeignAPIFile.php
@@
-154,7
+154,7
@@
class ForeignAPIFile extends File {
/**
* @param int $page
/**
* @param int $page
- * @return int
|number
+ * @return int
*/
public function getWidth( $page = 1 ) {
return isset( $this->mInfo['width'] ) ? intval( $this->mInfo['width'] ) : 0;
*/
public function getWidth( $page = 1 ) {
return isset( $this->mInfo['width'] ) ? intval( $this->mInfo['width'] ) : 0;
@@
-184,11
+184,7
@@
class ForeignAPIFile extends File {
* null on error
*/
public function getExtendedMetadata() {
* null on error
*/
public function getExtendedMetadata() {
- if ( isset( $this->mInfo['extmetadata'] ) ) {
- return $this->mInfo['extmetadata'];
- }
-
- return null;
+ return $this->mInfo['extmetadata'] ?? null;
}
/**
}
/**