Index: trunk/core/kernel/db/dblist.php =================================================================== diff -u -N -r4899 -r5547 --- trunk/core/kernel/db/dblist.php (.../dblist.php) (revision 4899) +++ trunk/core/kernel/db/dblist.php (.../dblist.php) (revision 5547) @@ -148,7 +148,7 @@ var $HavingFilter = Array(FLT_SYSTEM => null, FLT_NORMAL => null, FLT_SEARCH => null, FLT_VIEW => null); var $AggregateFilter = Array(FLT_SYSTEM => null, FLT_NORMAL => null); - + var $GroupByFields = Array(); var $Queried = false; @@ -172,13 +172,13 @@ $this->HavingFilter[FLT_SYSTEM] =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_AND); $this->HavingFilter[FLT_NORMAL] =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_OR); - + $this->HavingFilter[FLT_SEARCH] =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_OR); $this->HavingFilter[FLT_VIEW] =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_AND); $this->AggregateFilter[FLT_SYSTEM] =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_AND); $this->AggregateFilter[FLT_NORMAL] =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_OR); - + $this->PerPage = -1; } @@ -236,18 +236,18 @@ $this->HavingFilter[FLT_SYSTEM]->clearFilters(); $this->AggregateFilter[FLT_SYSTEM]->clearFilters(); } - + if ($user) { $this->WhereFilter[FLT_NORMAL]->clearFilters(); $this->HavingFilter[FLT_NORMAL]->clearFilters(); $this->AggregateFilter[FLT_NORMAL]->clearFilters(); } - + if ($search) { $this->WhereFilter[FLT_SEARCH]->clearFilters(); $this->HavingFilter[FLT_SEARCH]->clearFilters(); } - + if ($view) { $this->WhereFilter[FLT_VIEW]->clearFilters(); $this->HavingFilter[FLT_VIEW]->clearFilters(); @@ -508,7 +508,7 @@ if ($aggregated == 0) { $having->addFilter('system_aggregated', $this->AggregateFilter[FLT_SYSTEM] ); } - + if (!$system_filters_only) { $having->addFilter('view_having', $this->HavingFilter[FLT_VIEW] ); $search_w = $this->WhereFilter[FLT_SEARCH]->getSQL();