From 4ac8e0d585c5200c28b6fba617b82f978e9f7d06 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sat, 25 Aug 2007 22:25:17 +0000 Subject: [PATCH] * (bug 11065) Fix regression in handling of wiki-formatted EXIF metadata Removed a wfEscapeWikiText() in the metadata formatting code... that whole mess needs some major cleanup, though. :) Probably escaping should happen on the _input_ somewhere in the boxels of EXIF stuff. --- RELEASE-NOTES | 1 + includes/media/Generic.php | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index f3c9ad6d12..2b24739d29 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -411,6 +411,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN available databases in installer * Resizing transparent GIF images with GD now retains transparency by skipping resampling +* (bug 11065) Fix regression in handling of wiki-formatted EXIF metadata == API changes since 1.10 == diff --git a/includes/media/Generic.php b/includes/media/Generic.php index 1c463da246..12c3051c12 100644 --- a/includes/media/Generic.php +++ b/includes/media/Generic.php @@ -195,11 +195,19 @@ abstract class MediaHandler { return false; } + /** + * @fixme document this! + * 'value' thingy goes into a wikitext table; it used to be escaped but + * that was incompatible with previous practice of customized display + * with wikitext formatting via messages such as 'exif-model-value'. + * So the escaping is taken back out, but generally this seems a confusing + * interface. + */ protected static function addMeta( &$array, $visibility, $type, $id, $value, $param = false ) { $array[$visibility][] = array( 'id' => "$type-$id", 'name' => wfMsg( "$type-$id", $param ), - 'value' => wfEscapeWikiText( $value ) + 'value' => $value ); } -- 2.20.1