From 70ffc1b766907f4faa0ca794e6c5db17d3cc9c9f Mon Sep 17 00:00:00 2001 From: "silver%warwickcompsoc.co.uk" Date: Sun, 24 Oct 2004 22:49:27 +0000 Subject: [PATCH] Bug 262037 - Only search for plugins to remove by URL, not ID. ChatZilla only. r=rginda p=samuel@sieb.net (Samuel Sieb) git-svn-id: svn://10.0.0.236/trunk@164305 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/irc/xul/content/commands.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mozilla/extensions/irc/xul/content/commands.js b/mozilla/extensions/irc/xul/content/commands.js index cc93109758e..f842d34fc5d 100644 --- a/mozilla/extensions/irc/xul/content/commands.js +++ b/mozilla/extensions/irc/xul/content/commands.js @@ -1848,13 +1848,11 @@ function cmdLoad(e) var ex; var plugin; - function removeOldPlugin(id) + function removeOldPlugin(url) { var oldPlugin; - var i = getPluginIndexByURL(e.url); - if ((i == -1) && id) - i = getPluginIndexById(id); + var i = getPluginIndexByURL(url); if (i == -1) return -1; @@ -1905,9 +1903,9 @@ function cmdLoad(e) { var rvStr; var rv = rvStr = client.load(e.url, e.scope); - var index; + var index = removeOldPlugin(e.url); - if ((index = removeOldPlugin(plugin.id)) == null) + if (index == null) return null; if ("init" in plugin)