Bug 1384709 - Store extension ID in loadPath. r?florian draft
authorMichael Kaply <mozilla@kaply.com>
Tue, 08 Aug 2017 13:49:22 -0700
changeset 642861 e77d7d3b4997f47699c162efab43770a970046de
parent 642518 a921bfb8a2cf3db4d9edebe9b35799a3f9d035da
child 725120 ac68f01d287f772be3fabbb299799c546e1cf2db
push id72888
push usermozilla@kaply.com
push dateTue, 08 Aug 2017 20:49:42 +0000
reviewersflorian
bugs1384709
milestone57.0a1
Bug 1384709 - Store extension ID in loadPath. r?florian MozReview-Commit-ID: GPYdRtJd8Bz
toolkit/components/search/nsSearchService.js
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -4031,16 +4031,19 @@ SearchService.prototype = {
       FAIL("Invalid template passed to addEngineWithDetails!");
     if (this._engines[aName])
       FAIL("An engine with that name already exists!", Cr.NS_ERROR_FILE_ALREADY_EXISTS);
 
     var engine = new Engine(sanitizeName(aName), false);
     engine._initFromMetadata(aName, aIconURL, aAlias, aDescription,
                              aMethod, aTemplate, aExtensionID);
     engine._loadPath = "[other]addEngineWithDetails";
+    if (aExtensionID) {
+      engine._loadPath += ":" + aExtensionID;
+    }
     this._addEngineToStore(engine);
   },
 
   addEngine: function SRCH_SVC_addEngine(aEngineURL, aDataType, aIconURL,
                                          aConfirm, aCallback) {
     LOG("addEngine: Adding \"" + aEngineURL + "\".");
     this._ensureInitialized();
     try {