Merge pull request #1013 from tractorcow/pulls/3.2-fix-fulltext-query…

…-encoding BUG Fix encoding of SearchForm::getSearchQuery
silverstripe · Jun 14, 2014 · 30d42e0 · 30d42e0
2 parents 1a85c7a + 5dd0583
commit 30d42e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/code/search/ContentControllerSearchExtension.php b/code/search/ContentControllerSearchExtension.php
@@ -42,7 +42,7 @@ public function SearchForm() {
 	public function results($data, $form, $request) {
 		$data = array(
 			'Results' => $form->getResults(),
-			'Query' => $form->getSearchQuery(),
+			'Query' => DBField::create_field('Text', $form->getSearchQuery()),
 			'Title' => _t('SearchForm.SearchResults', 'Search Results')
 		);
 		return $this->owner->customise($data)->renderWith(array('Page_results', 'Page'));

diff --git a/code/search/SearchForm.php b/code/search/SearchForm.php
@@ -27,6 +27,10 @@ class SearchForm extends Form {
 		"SiteTree", "File"
 	);
 
+	private static $casting = array(
+		'SearchQuery' => 'Text'
+	);
+
 	/**
 	 * 
 	 * @param Controller $controller
@@ -186,7 +190,7 @@ public function getSearchQuery($data = null) {
 		if(!isset($data)) $data = $_REQUEST;
 
 		// The form could be rendered without the search being done, so check for that.
-		if (isset($data['Search'])) return Convert::raw2xml($data['Search']);
+		if (isset($data['Search'])) return $data['Search'];
 	}
 
 	/**