tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
BUG Fix encoding of SearchForm::getSearchQuery
This commit is contained in:
Stig Lindqvist 2014-06-14 17:15:40 +12:00
commit 30d42e06d6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/search/ContentControllerSearchExtension.php
View File

@ -42,7 +42,7 @@ class ContentControllerSearchExtension extends Extension {
public function results($data, $form, $request) { public function results($data, $form, $request) {
$data = array( $data = array(
'Results' => $form->getResults(), 'Results' => $form->getResults(),
'Query' => $form->getSearchQuery(), 'Query' => DBField::create_field('Text', $form->getSearchQuery()),
'Title' => _t('SearchForm.SearchResults', 'Search Results') 'Title' => _t('SearchForm.SearchResults', 'Search Results')
); );
return $this->owner->customise($data)->renderWith(array('Page_results', 'Page')); return $this->owner->customise($data)->renderWith(array('Page_results', 'Page'));

6
code/search/SearchForm.php
View File

@ -27,6 +27,10 @@ class SearchForm extends Form {
"SiteTree", "File" "SiteTree", "File"
); );
private static $casting = array(
'SearchQuery' => 'Text'
);
/** /**
* *
* @param Controller $controller * @param Controller $controller
@ -186,7 +190,7 @@ class SearchForm extends Form {
if(!isset($data)) $data = $_REQUEST; if(!isset($data)) $data = $_REQUEST;
// The form could be rendered without the search being done, so check for that. // 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'];
} }
/** /**