From 7ba876bdbd6f1532cef5a392521c1d3af387b5a2 Mon Sep 17 00:00:00 2001
From: "Callek%gmail.com"
 <Callek%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 21 Feb 2008 06:06:09 +0000
Subject: [PATCH] Bug 416457 - Wrong favicon displayed on Wikipedia page,
 r+sr=Neil

git-svn-id: svn://10.0.0.236/trunk@246156 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/browser/pageinfo/feeds.js    | 6 +++---
 mozilla/suite/browser/pageinfo/pageInfo.js | 4 ++--
 mozilla/suite/browser/tabbrowser.xml       | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mozilla/suite/browser/pageinfo/feeds.js b/mozilla/suite/browser/pageinfo/feeds.js
index 6f468f22b4e..0175eca44be 100644
--- a/mozilla/suite/browser/pageinfo/feeds.js
+++ b/mozilla/suite/browser/pageinfo/feeds.js
@@ -56,9 +56,9 @@ function initFeedTab()
       continue;
 
     var rel = link.rel && link.rel.toLowerCase();
-    var isFeed = /\bfeed\b/i.test(rel);
-    if (!isFeed && /\balternate\b/.test(rel) &&
-        !/\bstylesheet\b/.test(rel)) {
+    var isFeed = /(?:^|\s)feed(?:\s|$)/i.test(rel);
+    if (!isFeed && /(?:^|\s)alternate(?:\s|$)/i.test(rel) &&
+        !/(?:^|\s)stylesheet(?:\s|$)/i.test(rel)) {
       var feed = { title: link.title, href: link.href, type: link.type };
       if (isValidFeed(feed, gDocument.nodePrincipal, isFeed)) {
         var type = feed.type;
diff --git a/mozilla/suite/browser/pageinfo/pageInfo.js b/mozilla/suite/browser/pageinfo/pageInfo.js
index 8a10f6c2241..0020f16f809 100644
--- a/mozilla/suite/browser/pageinfo/pageInfo.js
+++ b/mozilla/suite/browser/pageinfo/pageInfo.js
@@ -541,9 +541,9 @@ function grabAll(elem)
     if (elem.rel)
     {
       var rel = elem.rel;
-      if (/\bicon\b/i.test(rel))
+      if (/(?:^|\s)icon(?:\s|$)/i.test(rel))
         addImage(elem.href, gStrings.mediaLink, "", elem, false);
-      else if (/\bstylesheet\b/i.test(rel))
+      else if (/(?:^|\s)stylesheet(?:\s|$)/i.test(rel))
         gLinkView.addRow([elem.rel, elem.href, gStrings.linkStylesheet, elem.target]);
       else
         gLinkView.addRow([elem.rel, elem.href, gStrings.linkRel, elem.target]);
diff --git a/mozilla/suite/browser/tabbrowser.xml b/mozilla/suite/browser/tabbrowser.xml
index b500acd05df..d0d16ba36d6 100644
--- a/mozilla/suite/browser/tabbrowser.xml
+++ b/mozilla/suite/browser/tabbrowser.xml
@@ -886,12 +886,12 @@
               return;
 
             var rel = event.originalTarget.rel;
-            var isIcon = /\bicon\b/i.test(rel) &&
+            var isIcon = /(?:^|\s)icon(?:\s|$)/i.test(rel) &&
                          this.mPrefs.getBoolPref("browser.chrome.site_icons");
 
-            var isFeed = /\bfeed\b/i.test(rel);
-            if (!isFeed && /\balternate\b/i.test(rel) &&
-                !/\bstylesheet\b/i.test(rel)) {
+            var isFeed = /(?:^|\s)feed(?:\s|$)/i.test(rel);
+            if (!isFeed && /(?:^|\s)alternate(?:\s|$)/i.test(rel) &&
+                !/(?:^|\s)stylesheet(?:\s|$)/i.test(rel)) {
               switch (event.originalTarget.type.toLowerCase()
                            .replace(/^\s+|\s*(?:;.*)?$/g, "")) {
                 case "text/xml":