From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 25 Aug 2007 22:25:17 +0000 (+0000)
Subject: * (bug 11065) Fix regression in handling of wiki-formatted EXIF metadata
X-Git-Tag: 1.31.0-rc.0~51661
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=4ac8e0d585c5200c28b6fba617b82f978e9f7d06;p=lhc%2Fweb%2Fwiklou.git

* (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.
---

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
 		);
 	}