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 "Skin: Make skins aware of their registered skin name"
[lhc/web/wiklou.git]
/
includes
/
media
/
FormatMetadata.php
diff --git
a/includes/media/FormatMetadata.php
b/includes/media/FormatMetadata.php
index
69982c2
..
6661965
100644
(file)
--- a/
includes/media/FormatMetadata.php
+++ b/
includes/media/FormatMetadata.php
@@
-1675,7
+1675,7
@@
class FormatMetadata extends ContextSource {
*
* @param File $file File to use
* @param array $extendedMetadata
*
* @param File $file File to use
* @param array $extendedMetadata
- * @param int $maxCacheTime Hook handlers might use this parameter to override cache time
+ * @param int
&
$maxCacheTime Hook handlers might use this parameter to override cache time
*
* @return array [<property name> => ['value' => <value>]], or [] on error
* @since 1.23
*
* @return array [<property name> => ['value' => <value>]], or [] on error
* @since 1.23
@@
-1761,9
+1761,9
@@
class FormatMetadata extends ContextSource {
}
return $newValue;
} else { // _type is 'ul' or 'ol' or missing in which case it defaults to 'ul'
}
return $newValue;
} else { // _type is 'ul' or 'ol' or missing in which case it defaults to 'ul'
-
list( $k, $v ) = each
( $value );
- if (
$k
=== '_type' ) {
- $v =
curren
t( $value );
+
$v = reset
( $value );
+ if (
key( $value )
=== '_type' ) {
+ $v =
nex
t( $value );
}
return $v;
}
}
return $v;
}
@@
-1772,7
+1772,7
@@
class FormatMetadata extends ContextSource {
/**
* Takes an array returned by the getExtendedMetadata* functions,
* and resolves multi-language values in it.
/**
* Takes an array returned by the getExtendedMetadata* functions,
* and resolves multi-language values in it.
- * @param array $metadata
+ * @param array
&
$metadata
* @since 1.23
*/
protected function resolveMultilangMetadata( &$metadata ) {
* @since 1.23
*/
protected function resolveMultilangMetadata( &$metadata ) {
@@
-1789,7
+1789,7
@@
class FormatMetadata extends ContextSource {
/**
* Takes an array returned by the getExtendedMetadata* functions,
* and turns all fields into single-valued ones by dropping extra values.
/**
* Takes an array returned by the getExtendedMetadata* functions,
* and turns all fields into single-valued ones by dropping extra values.
- * @param array $metadata
+ * @param array
&
$metadata
* @since 1.25
*/
protected function discardMultipleValues( &$metadata ) {
* @since 1.25
*/
protected function discardMultipleValues( &$metadata ) {
@@
-1810,7
+1810,7
@@
class FormatMetadata extends ContextSource {
/**
* Makes sure the given array is a valid API response fragment
/**
* Makes sure the given array is a valid API response fragment
- * @param array $arr
+ * @param array
&
$arr
*/
protected function sanitizeArrayForAPI( &$arr ) {
if ( !is_array( $arr ) ) {
*/
protected function sanitizeArrayForAPI( &$arr ) {
if ( !is_array( $arr ) ) {