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

BUGFIX #3798 ajshort: Let searchcontext be used on sitetree (merged r73758)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73760 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2009-03-29 21:03:17 +00:00
parent 496ada9c9d
commit cedee5705f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
search/SearchContext.php
View File

@ -108,7 +108,7 @@ class SearchContext extends Object {
if($existingQuery) { if($existingQuery) {
$query = $existingQuery; $query = $existingQuery;
} else { } else {
$query = $model->extendedSQL(); $query = $model->buildSQL();
} }
$SQL_limit = Convert::raw2sql($limit); $SQL_limit = Convert::raw2sql($limit);
@ -139,6 +139,8 @@ class SearchContext extends Object {
$query->connective = $this->connective; $query->connective = $this->connective;
$query->distinct = true; $query->distinct = true;
$model->extend('augmentSQL', $query);
return $query; return $query;
} }

2
search/filters/SearchFilter.php
View File

@ -94,7 +94,7 @@ abstract class SearchFilter extends Object {
} }
if($candidateClass == 'DataObject') user_error("Couldn't find field $this->name in any of $this->model's tables.", E_USER_ERROR); if($candidateClass == 'DataObject') user_error("Couldn't find field $this->name in any of $this->model's tables.", E_USER_ERROR);
return $candidateClass . "." . $this->name; return "\"$candidateClass\".\"$this->name\"";
} }
/** /**