From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Tue, 11 Aug 2009 08:36:18 +0000 (+0000)
Subject: * Do not transform EXIF fields with pure text to avoid results like foo,bar@example,com
X-Git-Tag: 1.31.0-rc.0~40362
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=434436a35f9920c154c3fdaa901c02856ded74a0;p=lhc%2Fweb%2Fwiklou.git

* Do not transform EXIF fields with pure text to avoid results like foo,bar@example,com
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ceb45bd4a9..2e5a17b869 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -402,6 +402,8 @@ this. Was used when mwEmbed was going to be an extension.
 * (bug 19289) importDump.php can now handle bzip2 and 7zip
 * (bug 20131) Fixed a PHP notice for users having the "rollback" right on
   Special:RecentChangesLinked
+* Do not transform EXIF fields with pure text to avoid results like
+  foo,bar@example,com
 
 == API changes in 1.16 ==
 
diff --git a/includes/Exif.php b/includes/Exif.php
index f601c92d99..971d01928b 100644
--- a/includes/Exif.php
+++ b/includes/Exif.php
@@ -1043,6 +1043,14 @@ class FormatExif {
 					$this->formatNum( $val ) );
 				break;
 
+			// Do not transform fields with pure text.
+			// For some languages the formatNum() conversion results to wrong output like
+			// foo,bar@example,com or fooÙ«bar@exampleÙ«com
+			case 'ImageDescription':
+			case 'Artist':
+			case 'Copyright':
+				$tags[$tag] = htmlspecialchars( $val );
+				break;
 			default:
 				$tags[$tag] = $this->formatNum( $val );
 				break;