From 33b84944c726d6bb3f1148df2161b8e97c5cec5e Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Fri, 25 Feb 2011 14:23:04 -0500
Subject: [PATCH] Bug 635375 - Preferences > add-ons > get add-ons 'go to page'
 disabled [r=dtownsend a=dtownsend]

---
 toolkit/mozapps/extensions/AddonRepository.jsm                 | 3 ++-
 .../extensions/test/xpcshell/data/test_AddonRepository.xml     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/toolkit/mozapps/extensions/AddonRepository.jsm b/toolkit/mozapps/extensions/AddonRepository.jsm
index 78b09784fef9..1a414c197754 100644
--- a/toolkit/mozapps/extensions/AddonRepository.jsm
+++ b/toolkit/mozapps/extensions/AddonRepository.jsm
@@ -899,8 +899,9 @@ var AddonRepository = {
       let localName = node.localName;
 
       // Handle case where the wanted string value is located in text content
+      // but only if the content is not empty
       if (localName in STRING_KEY_MAP) {
-        addon[STRING_KEY_MAP[localName]] = this._getTextContent(node);
+        addon[STRING_KEY_MAP[localName]] = this._getTextContent(node) || addon[STRING_KEY_MAP[localName]];
         continue;
       }
 
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository.xml b/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository.xml
index d994b2ef8a3b..a066ca1e4ec1 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository.xml
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository.xml
@@ -79,6 +79,7 @@
     <!-- Test that learnmore is used as the add-on's homepageURL
          if there is no homepage defined -->
     <learnmore>http://localhost:4444/learnmore2.html</learnmore>
+    <homepage/>
     <support>http://localhost:4444/support2.html</support>
     <contribution_data>
       <link>http://localhost:4444/contribution2.html</link>