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

BUG Fix encoding of SearchForm::getSearchQuery

Browse Source 
This made it awkward for user code to extract the query value for use in other applications; This would otherwise have to be xml decoded again.
Casting has been promoted to the templating level via DBField::create_field and a `SearchForm.casting` config setting.
This commit is contained in:
Damian Mooyman 2014-04-30 11:05:25 +12:00
parent b3699281c0
commit 5dd058338a
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) {
$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'));

6
code/search/SearchForm.php
View File

@ -27,6 +27,10 @@ class SearchForm extends Form {
"SiteTree", "File"
);
private static $casting = array(
'SearchQuery' => 'Text'
);
/**
*
* @param Controller $controller
@ -186,7 +190,7 @@ class SearchForm extends Form {
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'];
}
/**