From 15a3e7b97daccff5a70f0a0bbf74270fad7f44d3 Mon Sep 17 00:00:00 2001
From: Tim Tucker <tim@timtucker.com>
Date: Tue, 2 Oct 2012 09:18:45 -0300
Subject: [PATCH] Update media/src/core/core.filter.js

Reorder things a little to simplify
---
 media/src/core/core.filter.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/media/src/core/core.filter.js b/media/src/core/core.filter.js
index c6c47e9a..5299c6af 100644
--- a/media/src/core/core.filter.js
+++ b/media/src/core/core.filter.js
@@ -1,5 +1,4 @@
 
-
 /**
  * Generate the node required for filtering text
  *  @returns {node} Filter control element
@@ -336,22 +335,19 @@ function _fnBuildSearchRow( oSettings, aData )
  */
 function _fnFilterCreateSearch( sSearch, bRegex, bSmart, bCaseInsensitive )
 {
-	var asSearch, sRegExpString;
+	var asSearch,
+		sRegExpString = bRegex ? sSearch : _fnEscapeRegex( sSearch );
 	
 	if ( bSmart )
 	{
 		/* Generate the regular expression to use. Something along the lines of:
 		 * ^(?=.*?\bone\b)(?=.*?\btwo\b)(?=.*?\bthree\b).*$
 		 */
-		asSearch = bRegex ? sSearch.split( ' ' ) : _fnEscapeRegex( sSearch ).split( ' ' );
+		asSearch = sRegExpString.split( ' ' );
 		sRegExpString = '^(?=.*?'+asSearch.join( ')(?=.*?' )+').*$';
-		return new RegExp( sRegExpString, bCaseInsensitive ? "i" : "" );
-	}
-	else
-	{
-		sSearch = bRegex ? sSearch : _fnEscapeRegex( sSearch );
-		return new RegExp( sSearch, bCaseInsensitive ? "i" : "" );
 	}
+	
+	return new RegExp( sRegExpString, bCaseInsensitive ? "i" : "" );
 }