| Index: branches/uploadwizard/phase3/includes/upload/UploadBase.php |
| — | — | @@ -1200,30 +1200,20 @@ |
| 1201 | 1201 | /** |
| 1202 | 1202 | * Gets image info about the file just uploaded. |
| 1203 | 1203 | * |
| 1204 | | - * @param {ApiResult} |
| 1205 | | - * @return {Array} image info |
| 1206 | | - */ |
| 1207 | | - public function getImageInfo( $result ) { |
| 1208 | | - return $this->getImageInfoForFile( $this->getLocalFile(), $result ); |
| 1209 | | - } |
| 1210 | | - |
| 1211 | | - /** |
| 1212 | | - * Gets image info about any file object (useful for some API functions which return information |
| 1213 | | - * about several files (such as the original and a thumbnail). |
| 1214 | | - * |
| 1215 | 1204 | * Also has the effect of setting metadata to be an 'indexed tag name' in returned API result if |
| 1216 | 1205 | * 'metadata' was requested. Oddly, we have to pass the "result" object down just so it can do that |
| 1217 | 1206 | * with the appropriate format, presumably. |
| 1218 | 1207 | * |
| 1219 | | - * @param {File} file object |
| 1220 | 1208 | * @param {ApiResult} |
| 1221 | 1209 | * @return {Array} image info |
| 1222 | 1210 | */ |
| 1223 | | - protected function getImageInfoForFile( $file, $result ) { |
| | 1211 | + public function getImageInfo( $result ) { |
| | 1212 | + $file = $this->getLocalFile(); |
| 1224 | 1213 | $imParam = ApiQueryImageInfo::getPropertyNames(); |
| 1225 | 1214 | return ApiQueryImageInfo::getInfo( $file, array_flip( $imParam ), $result ); |
| 1226 | 1215 | } |
| 1227 | 1216 | |
| | 1217 | + |
| 1228 | 1218 | public function convertVerifyErrorToStatus( $error ) { |
| 1229 | 1219 | $code = $error['status']; |
| 1230 | 1220 | unset( $code['status'] ); |