X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=blobdiff_plain;f=includes%2Ffilerepo%2Ffile%2FOldLocalFile.php;h=f5b7d4384cc61e2f91eb524300976a8556987b23;hb=c29909e59fd89d9fc65a299687ad2aa2df995acc;hp=584e00121188acb12a078fc35eebee12174ccf84;hpb=6cfb2e3d7a2b96d5041312fcec88248bb46573d7;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/filerepo/file/OldLocalFile.php b/includes/filerepo/file/OldLocalFile.php index 584e001211..f5b7d4384c 100644 --- a/includes/filerepo/file/OldLocalFile.php +++ b/includes/filerepo/file/OldLocalFile.php @@ -106,46 +106,6 @@ class OldLocalFile extends LocalFile { } } - /** - * Fields in the oldimage table - * @deprecated since 1.31, use self::getQueryInfo() instead. - * @return string[] - */ - static function selectFields() { - global $wgActorTableSchemaMigrationStage; - - wfDeprecated( __METHOD__, '1.31' ); - if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_READ_NEW ) { - // If code is using this instead of self::getQueryInfo(), there's a - // decent chance it's going to try to directly access - // $row->oi_user or $row->oi_user_text and we can't give it - // useful values here once those aren't being used anymore. - throw new BadMethodCallException( - 'Cannot use ' . __METHOD__ - . ' when $wgActorTableSchemaMigrationStage has SCHEMA_COMPAT_READ_NEW' - ); - } - - return [ - 'oi_name', - 'oi_archive_name', - 'oi_size', - 'oi_width', - 'oi_height', - 'oi_metadata', - 'oi_bits', - 'oi_media_type', - 'oi_major_mime', - 'oi_minor_mime', - 'oi_user', - 'oi_user_text', - 'oi_actor' => 'NULL', - 'oi_timestamp', - 'oi_deleted', - 'oi_sha1', - ] + MediaWikiServices::getInstance()->getCommentStore()->getFields( 'oi_description' ); - } - /** * Return the tables, fields, and join conditions to be selected to create * a new oldlocalfile object.