From 4a290910ca03c0552aed977c2d582c0798fe3fbd Mon Sep 17 00:00:00 2001
From: Ajay D'Souza <me@ajaydsouza.com>
Date: Sun, 28 Dec 2014 03:17:25 +0000
Subject: [PATCH] Fixed missing wick files in Admin

---
 README.md         |  2 +-
 admin.inc.php     | 31 ++++---------------------------
 better-search.php |  4 ++--
 readme.txt        | 11 +++++++----
 4 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index d1168c0..270db3d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 __Requires:__ 3.0
 
-__Tested up to:__ 4.0
+__Tested up to:__ 4.2
 
 __License:__ [GPL-2.0+](http://www.gnu.org/licenses/gpl-2.0.html)
 
diff --git a/admin.inc.php b/admin.inc.php
index fbfe2bf..cf9a993 100644
--- a/admin.inc.php
+++ b/admin.inc.php
@@ -110,7 +110,7 @@ function bsearch_options() {
 	<div id="post-body" class="metabox-holder columns-2">
 	<div id="post-body-content">
 	  <form method="post" id="bsearch_options" name="bsearch_options" onsubmit="return checkForm()">
-	    <div id="genopdiv" class="postbox closed"><div class="handlediv" title="<?php _e( 'Click to toggle', BSEARCH_LOCAL_NAME ); ?>"><br /></div>
+	    <div id="genopdiv" class="postbox"><div class="handlediv" title="<?php _e( 'Click to toggle', BSEARCH_LOCAL_NAME ); ?>"><br /></div>
 	      <h3 class='hndle'><span><?php _e( 'General options', BSEARCH_LOCAL_NAME ); ?></span></h3>
 	      <div class="inside">
 			<table class="form-table">
@@ -207,7 +207,7 @@ function bsearch_options() {
 			</table>
 	      </div>
 	    </div>
-	    <div id="outputopdiv" class="postbox closed"><div class="handlediv" title="<?php _e( 'Click to toggle', BSEARCH_LOCAL_NAME ); ?>"><br /></div>
+	    <div id="outputopdiv" class="postbox"><div class="handlediv" title="<?php _e( 'Click to toggle', BSEARCH_LOCAL_NAME ); ?>"><br /></div>
 	      <h3 class='hndle'><span><?php _e( 'Output options', BSEARCH_LOCAL_NAME ); ?></span></h3>
 	      <div class="inside">
 			<table class="form-table">
@@ -286,7 +286,7 @@ function bsearch_options() {
 			</table>
 	      </div>
 	    </div>
-	    <div id="customcssdiv" class="postbox closed"><div class="handlediv" title="<?php _e( 'Click to toggle', BSEARCH_LOCAL_NAME ); ?>"><br /></div>
+	    <div id="customcssdiv" class="postbox"><div class="handlediv" title="<?php _e( 'Click to toggle', BSEARCH_LOCAL_NAME ); ?>"><br /></div>
 	      <h3 class='hndle'><span><?php _e( 'Custom CSS', BSEARCH_LOCAL_NAME ); ?></span></h3>
 	      <div class="inside">
 			<table class="form-table">
@@ -305,7 +305,7 @@ function bsearch_options() {
 	  </form>
 
 	  <form method="post" id="bsearch_reset_options" name="bsearch_reset_options" onsubmit="return checkForm()">
-	    <div id="resetopdiv" class="postbox closed"><div class="handlediv" title="<?php _e( 'Click to toggle', BSEARCH_LOCAL_NAME ); ?>"><br /></div>
+	    <div id="resetopdiv" class="postbox"><div class="handlediv" title="<?php _e( 'Click to toggle', BSEARCH_LOCAL_NAME ); ?>"><br /></div>
 	      <h3 class='hndle'><span><?php _e( 'Reset count', BSEARCH_LOCAL_NAME ); ?></span></h3>
 	      <div class="inside">
 		    <p class="description">
@@ -464,29 +464,6 @@ function checkForm() {
 		//]]>
 	</script>
 
-	<link rel="stylesheet" type="text/css" href="<?php echo $bsearch_url ?>/wick/wick.css" />
-	<script type="text/javascript" language="JavaScript">
-		//<![CDATA[
-		<?php
-		function wick_data() {
-			global $wpdb;
-
-			$categories = get_categories( 'hide_empty=0' );
-			$str = 'collection = [';
-			foreach ( $categories as $cat ) {
-				$str .= "'" . $cat->slug . "',";
-			}
-			$str = substr( $str, 0, -1 );	// Remove trailing comma
-			$str .= '];';
-
-			echo $str;
-		}
-		wick_data();
-		?>
-		//]]>
-	</script>
-
-	<script type="text/javascript" src="<?php echo $bsearch_url ?>/wick/wick.js"></script>
 	<script type="text/javascript" src="<?php echo $bsearch_url ?>/jscolor/jscolor.js"></script>
 <?php
 }
diff --git a/better-search.php b/better-search.php
index 6ba987a..f29aec6 100644
--- a/better-search.php
+++ b/better-search.php
@@ -9,7 +9,7 @@
  *
  * @wordpress-plugin
  * Plugin Name: Better Search
- * Version:     1.3.5
+ * Version:     1.3.6
  * Plugin URI:  http://ajaydsouza.com/wordpress/plugins/better-search/
  * Description: Replace the default WordPress search with a contextual search. Search results are sorted by relevancy ensuring a better visitor search experience.
  * Author:      Ajay D'Souza
@@ -1197,7 +1197,7 @@ function bsearch_default_options() {
 	.bsearch_footer { text-align: center; }
 	';
 
-	$badwords = array( 'anal', 'anus', 'ass', 'bastard', 'beastiality', 'bestiality', 'bewb', 'bitch', 'blow', 'blumpkin', 'boob', 'cawk', 'cock', 'choad', 'cooter', 'cornhole', 'cum', 'cunt', 'dick', 'dildo', 'dong', 'dyke', 'douche', 'fag', 'faggot', 'fart', 'foreskin', 'fuck', 'fuk', 'gangbang', 'gook', 'handjob', 'homo', 'honkey', 'humping', 'jiz', 'jizz', 'kike', 'kunt', 'labia', 'muff', 'nigger', 'nutsack', 'pen1s', 'penis', 'piss', 'poon', 'poop', 'punani', 'pussy', 'queef', 'queer', 'quim', 'rimjob', 'rape', 'rectal', 'rectum', 'semen', 'sex', 'shit', 'slut', 'spick', 'spoo', 'spooge', 'taint', 'titty', 'titties', 'twat', 'vag', 'vagina', 'vulva', 'wank', 'whore', );
+	$badwords = array( 'anal', 'anus', 'ass', 'bastard', 'beastiality', 'bestiality', 'bewb', 'bitch', 'blow', 'blumpkin', 'boob', 'cawk', 'cock', 'choad', 'cooter', 'cornhole', 'cum', 'cunt', 'dick', 'dildo', 'dong', 'dyke', 'douche', 'fag', 'faggot', 'fart', 'foreskin', 'fuck', 'fuk', 'gangbang', 'gook', 'handjob', 'homo', 'honkey', 'humping', 'jiz', 'jizz', 'kike', 'kunt', 'labia', 'muff', 'nigger', 'nutsack', 'pen1s', 'penis', 'piss', 'poon', 'poop', 'porn', 'punani', 'pussy', 'queef', 'queer', 'quim', 'rimjob', 'rape', 'rectal', 'rectum', 'semen', 'sex', 'shit', 'slut', 'spick', 'spoo', 'spooge', 'taint', 'titty', 'titties', 'twat', 'vag', 'vagina', 'vulva', 'wank', 'whore', );
 
 	$bsearch_settings = array(
 		'seamless' => false,			// Seamless integration mode
diff --git a/readme.txt b/readme.txt
index 14ee710..4a898bb 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,10 +1,10 @@
 === Better Search ===
-Tags: search, Better Search, related search, search results, heatmap, popular searches, top searches, relevance
+Tags: search, Better Search, related search, relevant search, search results, heatmap, popular searches, top searches, relevance
 Contributors: Ajay
 Donate link: http://ajaydsouza.com/donate/
 Stable tag: trunk
 Requires at least: 3.1
-Tested up to: 4.0
+Tested up to: 4.2
 License: GPLv2 or later
 
 
@@ -37,13 +37,16 @@ Additionally, the plugin also tracks the searches and you to display a "search h
 
 == Upgrade Notice ==
 
-= 1.3.5 =
-Fixed Reflective XSS vulnerability; other bug fixes;
+= 1.3.6 =
+Fixes missing wick files in Settings page 404 error;
 Check the Changelog for details
 
 
 == Changelog ==
 
+= 1.3.6 =
+Fixes missing wick files in Settings page 404 error
+
 = 1.3.5 =
 * Fixed: Seamless mode interfered with the Media search in the Admin
 * Fixed: Potential Reflective XSS vulnerability