From e693b211c3c44f86c97edb68981e408ac1a47db4 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk" <neil%parkwaycc.co.uk>
Date: Fri, 21 Oct 2005 23:01:24 +0000
Subject: [PATCH] Bug 270297 "Search web for..." mangles selections containing
 newlines (regression from bug 221361) p=elmar.ludwig@uos.de r+sr=me

---
 browser/base/content/browser.js                      | 3 ++-
 xpfe/communicator/resources/content/nsContextMenu.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 3cf8fe7e7530..29870a8a6eeb 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4801,7 +4801,8 @@ nsContextMenu.prototype = {
             pattern.test(searchStr);
             searchStr = RegExp.lastMatch;
         }
-        searchStr = searchStr.replace(/\s*(.*?)\s*$/, "$1");
+        searchStr = searchStr.replace(/^\s+/, "");
+        searchStr = searchStr.replace(/\s+$/, "");
         searchStr = searchStr.replace(/\s+/g, " ");
         return searchStr;
     },
diff --git a/xpfe/communicator/resources/content/nsContextMenu.js b/xpfe/communicator/resources/content/nsContextMenu.js
index 9310702c8098..8487c6ed3f3a 100644
--- a/xpfe/communicator/resources/content/nsContextMenu.js
+++ b/xpfe/communicator/resources/content/nsContextMenu.js
@@ -809,7 +809,8 @@ nsContextMenu.prototype = {
             pattern.test(searchStr);
             searchStr = RegExp.lastMatch;
         }
-        searchStr = searchStr.replace(/\s*(.*?)\s*$/, "$1");
+        searchStr = searchStr.replace(/^\s+/, "");
+        searchStr = searchStr.replace(/\s+$/, "");
         searchStr = searchStr.replace(/\s+/g, " ");
         return searchStr;
     },