| Index: trunk/phase3/includes/api/ApiQueryFilearchive.php |
| — | — | @@ -59,7 +59,7 @@ |
| 60 | 60 | $fld_user = isset( $prop['user'] ); |
| 61 | 61 | $fld_size = isset( $prop['size'] ); |
| 62 | 62 | $fld_dimensions = isset( $prop['dimensions'] ); |
| 63 | | - $fld_description = isset( $prop['description'] ); |
| | 63 | + $fld_description = isset( $prop['description'] ) || isset( $prop['parseddescription'] ); |
| 64 | 64 | $fld_mime = isset( $prop['mime'] ); |
| 65 | 65 | $fld_metadata = isset( $prop['metadata'] ); |
| 66 | 66 | $fld_bitdepth = isset( $prop['bitdepth'] ); |
| — | — | @@ -150,6 +150,11 @@ |
| 151 | 151 | } |
| 152 | 152 | if ( $fld_description ) { |
| 153 | 153 | $file['description'] = $row->fa_description; |
| | 154 | + if ( isset( $prop['parseddescription'] ) ) { |
| | 155 | + global $wgUser; |
| | 156 | + $file['parseddescription'] = $wgUser->getSkin()->formatComment( |
| | 157 | + $row->fa_description, $row->fa_name ); |
| | 158 | + } |
| 154 | 159 | } |
| 155 | 160 | if ( $fld_metadata ) { |
| 156 | 161 | $file['metadata'] = $row->fa_metadata |
| — | — | @@ -217,6 +222,7 @@ |
| 218 | 223 | 'size', |
| 219 | 224 | 'dimensions', |
| 220 | 225 | 'description', |
| | 226 | + 'parseddescription', |
| 221 | 227 | 'mime', |
| 222 | 228 | 'metadata', |
| 223 | 229 | 'bitdepth' |
| — | — | @@ -234,15 +240,16 @@ |
| 235 | 241 | 'limit' => 'How many images to return in total', |
| 236 | 242 | 'prop' => array( |
| 237 | 243 | 'What image information to get:', |
| 238 | | - ' sha1 - Adds SHA-1 hash for the image', |
| 239 | | - ' timestamp - Adds timestamp for the uploaded version', |
| 240 | | - ' user - Adds user who uploaded the image version', |
| 241 | | - ' size - Adds the size of the image in bytes and the height, width and page count (if applicable)', |
| 242 | | - ' dimensions - Alias for size', |
| 243 | | - ' description - Adds description the image version', |
| 244 | | - ' mime - Adds MIME of the image', |
| 245 | | - ' metadata - Lists EXIF metadata for the version of the image', |
| 246 | | - ' bitdepth - Adds the bit depth of the version', |
| | 244 | + ' sha1 - Adds SHA-1 hash for the image', |
| | 245 | + ' timestamp - Adds timestamp for the uploaded version', |
| | 246 | + ' user - Adds user who uploaded the image version', |
| | 247 | + ' size - Adds the size of the image in bytes and the height, width and page count (if applicable)', |
| | 248 | + ' dimensions - Alias for size', |
| | 249 | + ' description - Adds description the image version', |
| | 250 | + ' parseddescription - Parse the description on the version', |
| | 251 | + ' mime - Adds MIME of the image', |
| | 252 | + ' metadata - Lists EXIF metadata for the version of the image', |
| | 253 | + ' bitdepth - Adds the bit depth of the version', |
| 247 | 254 | ), |
| 248 | 255 | ); |
| 249 | 256 | } |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -266,6 +266,7 @@ |
| 267 | 267 | * (bug 27585) add pagecount to list=filearchive |
| 268 | 268 | * (bug 28104) Namespace for local pages in interwiki backlinks (iwbacklinks) |
| 269 | 269 | is missing |
| | 270 | +* (bug 27343) Add parseddescription to list=filearchive |
| 270 | 271 | |
| 271 | 272 | === Languages updated in 1.18 === |
| 272 | 273 | |