X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryImageInfo.php;h=d1fcfa3f07c9c24095544645fe57d7c71c962575;hb=444f5838afc627eccb102d3d229fe928998a3d9f;hp=ab9457406591703745f9cb35cf8db25ae58ab2dc;hpb=5886c0ebede4fe01a5097b207164d6fef18f4b6a;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php index ab94574065..d1fcfa3f07 100644 --- a/includes/api/ApiQueryImageInfo.php +++ b/includes/api/ApiQueryImageInfo.php @@ -162,7 +162,7 @@ class ApiQueryImageInfo extends ApiQueryBase { $gotOne = true; $fit = $this->addPageSubItem( $pageId, - self::getInfo( $img, $prop, $result, + static::getInfo( $img, $prop, $result, $finalThumbParams, $opts ) ); @@ -197,7 +197,7 @@ class ApiQueryImageInfo extends ApiQueryBase { } $fit = self::getTransformCount() < self::TRANSFORM_LIMIT && $this->addPageSubItem( $pageId, - self::getInfo( $oldie, $prop, $result, + static::getInfo( $oldie, $prop, $result, $finalThumbParams, $opts ) ); @@ -325,8 +325,8 @@ class ApiQueryImageInfo extends ApiQueryBase { * allows us to catch certain error conditions early (such as missing * required parameter). * - * @param $image File - * @param $finalParams array List of parameters to transform image with + * @param File $image + * @param array $finalParams List of parameters to transform image with */ protected function checkParameterNormalise( $image, $finalParams ) { $h = $image->getHandler(); @@ -533,11 +533,11 @@ class ApiQueryImageInfo extends ApiQueryBase { if ( $metadata && $version !== 'latest' ) { $metadata = $file->convertMetadataVersion( $metadata, $version ); } - $vals['metadata'] = $metadata ? self::processMetaData( $metadata, $result ) : null; + $vals['metadata'] = $metadata ? static::processMetaData( $metadata, $result ) : null; } if ( $commonmeta ) { $metaArray = $file->getCommonMetaArray(); - $vals['commonmetadata'] = $metaArray ? self::processMetaData( $metaArray, $result ) : []; + $vals['commonmetadata'] = $metaArray ? static::processMetaData( $metaArray, $result ) : []; } if ( $extmetadata ) { @@ -601,7 +601,7 @@ class ApiQueryImageInfo extends ApiQueryBase { ApiResult::META_BC_BOOLS => [ 'value' ], ]; if ( is_array( $value ) ) { - $r['value'] = self::processMetaData( $value, $result ); + $r['value'] = static::processMetaData( $value, $result ); } else { $r['value'] = $value; } @@ -641,8 +641,8 @@ class ApiQueryImageInfo extends ApiQueryBase { 'prop' => [ ApiBase::PARAM_ISMULTI => true, ApiBase::PARAM_DFLT => 'timestamp|user', - ApiBase::PARAM_TYPE => self::getPropertyNames(), - ApiBase::PARAM_HELP_MSG_PER_VALUE => self::getPropertyMessages(), + ApiBase::PARAM_TYPE => static::getPropertyNames(), + ApiBase::PARAM_HELP_MSG_PER_VALUE => static::getPropertyMessages(), ], 'limit' => [ ApiBase::PARAM_TYPE => 'limit', @@ -703,7 +703,7 @@ class ApiQueryImageInfo extends ApiQueryBase { * @return array */ public static function getPropertyNames( $filter = [] ) { - return array_keys( self::getPropertyMessages( $filter ) ); + return array_keys( static::getPropertyMessages( $filter ) ); } /** @@ -787,7 +787,7 @@ class ApiQueryImageInfo extends ApiQueryBase { public static function getPropertyDescriptions( $filter = [], $modulePrefix = '' ) { return array_merge( [ 'What image information to get:' ], - array_values( array_diff_key( self::getProperties( $modulePrefix ), array_flip( $filter ) ) ) + array_values( array_diff_key( static::getProperties( $modulePrefix ), array_flip( $filter ) ) ) ); }