* 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 ceb45bd..2e5a17b 100644 (file)
--- 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 f601c92..971d019 100644 (file)
--- 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;