Fixed problems with sitesearch regular expression and error when call…

…ing from scheduler
jbroadway · Nov 4, 2011 · 8bc1438 · 8bc1438
1 parent 47300c5
commit 8bc1438
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/inc/app/scheduler/tasks/sitesearch/index.php b/inc/app/scheduler/tasks/sitesearch/index.php
@@ -68,6 +68,12 @@
 			$item->sitellite_team = 'none';
 		}
 
+		if (! isset ($rex->body)) {
+			$rex->body = 'body';
+		}
+		if (! isset ($item->{$rex->body})) {
+			$item->{$rex->body} = '';
+		}
 		if ($collection != 'sitellite_filesystem') {
 			$item->{$rex->body} = extractor_run ($item->{$rex->body}, 'HTML');
 		}

diff --git a/inc/app/sitesearch/lib/SiteSearch.php b/inc/app/sitesearch/lib/SiteSearch.php
@@ -54,7 +54,7 @@ function _sanitize ($val) {
 	function _prepare ($val) {
 		//$val = iconv ($val);
 		//$val = strtolower (htmlentities_compat (strip_tags ($val)));
-		return preg_replace ('/([&\|\+!\(\)\[\]\{}~\*:\^"\?\-\\])/', '\\\\\1', strtolower ($val));
+		return preg_replace ('/([&\|\+!\(\)\[\]\{}~\*:\^"\?\\\-])/', '\\\\\1', strtolower ($val));
 	}
 
 	/**