From 1438d6450ff5995261705fc8e1181ed65bca027a Mon Sep 17 00:00:00 2001
From: Geoff Lankow <geoff@darktrojan.net>
Date: Sat, 24 Jul 2010 11:06:10 +0200
Subject: [PATCH] Bug 494328 - Media file display names should use
 decodeURIComponent instead of decodeURI. r=sayrer

---
 browser/components/feeds/src/FeedWriter.js    |  4 +-
 browser/components/feeds/test/Makefile.in     |  2 +
 .../components/feeds/test/bug494328-data.xml  | 24 ++++++++++++
 .../components/feeds/test/test_bug494328.html | 38 +++++++++++++++++++
 4 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 browser/components/feeds/test/bug494328-data.xml
 create mode 100644 browser/components/feeds/test/test_bug494328.html
diff --git a/browser/components/feeds/src/FeedWriter.js b/browser/components/feeds/src/FeedWriter.js
index 475213457db..a3b3bb023b4 100644
--- a/browser/components/feeds/src/FeedWriter.js
+++ b/browser/components/feeds/src/FeedWriter.js
@@ -554,9 +554,9 @@ FeedWriter.prototype = {
     var url = makeURI(aURL);
     url.QueryInterface(Ci.nsIURL);
     if (url == null || url.fileName.length == 0)
-      return aURL;
+      return decodeURIComponent(aURL);
 
-    return decodeURI(url.fileName);
+    return decodeURIComponent(url.fileName);
   },
 
   /**
diff --git a/browser/components/feeds/test/Makefile.in b/browser/components/feeds/test/Makefile.in
index 36265d91dab..389c04f503a 100644
--- a/browser/components/feeds/test/Makefile.in
+++ b/browser/components/feeds/test/Makefile.in
@@ -55,6 +55,8 @@ _TEST_FILES =	test_bug408328.html \
 		bug408328-data.xml \
 		test_bug368464.html \
 		bug368464-data.xml \
+		test_bug494328.html \
+		bug494328-data.xml \
 		test_registerHandler.html \
 		$(NULL)
 
diff --git a/browser/components/feeds/test/bug494328-data.xml b/browser/components/feeds/test/bug494328-data.xml
new file mode 100644
index 00000000000..58342bafc68
--- /dev/null
+++ b/browser/components/feeds/test/bug494328-data.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0">
+  <channel>
+    <title>Channel title</title>
+    <description>Channel description</description>
+    <link>Channel link</link>
+    <item>
+      <title>Episode 1</title>
+      <enclosure url="http://www.example.com/podcasts/Episode%201" length="0" type="audio/x-m4a" />
+    </item>
+    <item>
+      <title>Episode 2</title>
+      <enclosure url="http://www.example.com/podcasts/Episode%20%232" length="0" type="audio/x-m4a" />
+    </item>
+    <item>
+      <title>Episode 3</title>
+      <enclosure url="http://www.example.com/podcasts/Episode%20%233/" length="0" type="audio/x-m4a" />
+    </item>
+    <item>
+      <title>Episode 4</title>
+      <enclosure url="http://www.example.com/podcasts/Is%20This%20Episode%20%234%3F" length="0" type="audio/x-m4a" />
+    </item>
+  </channel>
+</rss>
diff --git a/browser/components/feeds/test/test_bug494328.html b/browser/components/feeds/test/test_bug494328.html
new file mode 100644
index 00000000000..f3ba2347189
--- /dev/null
+++ b/browser/components/feeds/test/test_bug494328.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=494328
+-->
+<head>
+  <title>Test for bug 494328</title>
+  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=494328">Mozilla Bug 494328</a>
+<p id="display"><iframe id="testFrame" src="bug494328-data.xml"></iframe></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+/** Test for Bug 494328 **/
+SimpleTest.waitForExplicitFinish();
+
+addLoadEvent(function() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
+  var links = $("testFrame").contentDocument.getElementById("feedContent").querySelectorAll("div.enclosure > a");
+  is(links[0].textContent, "Episode 1", "filename decoded incorrectly");
+  is(links[1].textContent, "Episode #2", "filename decoded incorrectly");
+  is(links[2].textContent, "http://www.example.com/podcasts/Episode #3/", "filename decoded incorrectly");
+  is(links[3].textContent, "Is This Episode #4?", "filename decoded incorrectly");
+});
+addLoadEvent(SimpleTest.finish);
+
+</script>
+</pre>
+</body>
+</html>
+
