r25812 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r25811‎ | r25812 | r25813 >
Date:15:09, 12 September 2007
Author:catrope
Status:old
Tags:
Comment:
(bug 11308) Allow the API to output the image metadata
Patch by Brian Tong Minh
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/api/ApiQueryImageInfo.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/api/ApiQueryImageInfo.php
@@ -51,6 +51,7 @@
5252 $fld_url = isset($prop['url']);
5353 $fld_size = isset($prop['size']);
5454 $fld_sha1 = isset($prop['sha1']);
 55+ $fld_metadata = isset($prop['metadata']);
5556
5657 $pageIds = $this->getPageSet()->getAllTitlesByNamespace();
5758 if (!empty($pageIds[NS_IMAGE])) {
@@ -91,6 +92,11 @@
9293
9394 if ($fld_sha1)
9495 $vals['sha1'] = wfBaseConvert($row["{$prefix}_sha1"], 36, 16, 40);
 96+
 97+ if ($fld_metadata) {
 98+ $metadata = unserialize($row["{$prefix}_metadata"]);
 99+ $vals['metadata'] = $metadata ? $metadata : null;
 100+ }
95101
96102 $data[] = $vals;
97103
@@ -123,7 +129,8 @@
124130 'comment',
125131 'url',
126132 'size',
127 - 'sha1'
 133+ 'sha1',
 134+ 'metadata'
128135 )
129136 ),
130137 'history' => false,
Index: trunk/phase3/RELEASE-NOTES
@@ -43,7 +43,6 @@
4444 editinterface to a new permission key editusercssjs.
4545 * (bug 11266) Set fallback language for Fulfulde (ff) to French
4646 * (bug 11179) Include image version deletion comment in public log
47 -* (bug 11158) Fix escaping in API HTML-formatted JSON
4847 * Fixed notice when accessing special page without read permission and whitelist
4948 is not defined
5049 * (bug 9252) Fix for tidy funkiness when using editintro mode
@@ -56,6 +55,7 @@
5756 Full API documentation is available at http://www.mediawiki.org/wiki/API
5857
5958 * (bug 11275) Enable descending sort in categorymembers
 59+* (bug 11308) Allow the API to output the image metadata
6060
6161 === Languages updated in 1.12 ===
6262

Follow-up revisions

RevisionCommit summaryAuthorDate
r25849Merged revisions 25804-25848 via svnmerge from...david06:54, 14 September 2007

Status & tagging log