Bug 635375 - Preferences > add-ons > get add-ons 'go to page' disabled [r=dtownsend a=dtownsend]

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

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>