Permalink
Browse files

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

…-encoding

BUG Fix encoding of SearchForm::getSearchQuery
  • Loading branch information...
2 parents 1a85c7a + 5dd0583 commit 30d42e06d6dbe5e860d96e9eae3ae095e700fb23 @stojg stojg committed Jun 14, 2014
Showing with 6 additions and 2 deletions.
  1. +1 −1 code/search/ContentControllerSearchExtension.php
  2. +5 −1 code/search/SearchForm.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'));
@@ -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'];
}
/**

0 comments on commit 30d42e0

Please sign in to comment.