From 2ee589af144a764d502ed0067b2b891b1c196ea8 Mon Sep 17 00:00:00 2001
From: antisnatchor <antisnatchor@b87d56ec-f9c0-11de-8c8a-61c5e9addfc9>
Date: Mon, 11 Jul 2011 13:33:43 +0000
Subject: [PATCH] =?UTF-8?q?(Fixes=20issue=20365)=20Fixed=20browser=20plugi?=
 =?UTF-8?q?n=20regex=20when=20using=20Ruby=201.9.2=20and=20UTF-8=20strings?=
 =?UTF-8?q?=20(like=20Microsoft=C2=AE=20DRM)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://beef.googlecode.com/svn/trunk@1059 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9
---
 core/filters/browser.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/filters/browser.rb b/core/filters/browser.rb
index 95b6cc18a..2f34e554c 100644
--- a/core/filters/browser.rb
+++ b/core/filters/browser.rb
@@ -53,8 +53,12 @@ module Filters
   # verify the browser_plugins string is valid
   def self.is_valid_browser_plugins?(str)
     return false if not is_non_empty_string?(str)
-    return false if str.length > 400  
-    return (str =~ /[^\w\d\s()-.,;_!\302\256]/).nil? # \302\256 is the (r) character
+    return false if str.length > 400
+    if RUBY_VERSION >= "1.9" && str.encoding === Encoding.find('UTF-8')
+      return (str =~ /[^\w\d\s()-.,;_!\302\256]/u).nil?
+    else
+      return (str =~ /[^\w\d\s()-.,;_!\302\256]/n).nil?
+    end
   end
 
 end