mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
BUGFIX Don't throw array error when no result columns are selected in ModelAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@78425 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
3095172519
commit
a3f3374205
@ -642,8 +642,9 @@ class ModelAdmin_CollectionController extends Controller {
|
|||||||
|
|
||||||
$summaryFields = $this->columnsAvailable();
|
$summaryFields = $this->columnsAvailable();
|
||||||
|
|
||||||
if($selectedOnly) {
|
$resultAssembly = $searchCriteria['ResultAssembly'];
|
||||||
$resultAssembly = $searchCriteria['ResultAssembly'];
|
if($selectedOnly && $resultAssembly) {
|
||||||
|
|
||||||
if(!is_array($resultAssembly)) {
|
if(!is_array($resultAssembly)) {
|
||||||
$explodedAssembly = split(' *, *', $resultAssembly);
|
$explodedAssembly = split(' *, *', $resultAssembly);
|
||||||
$resultAssembly = array();
|
$resultAssembly = array();
|
||||||
|
Loading…
Reference in New Issue
Block a user