Permalink
Browse files

More graceful handling of missing GET data in ModelAdmin

See #253
  • Loading branch information...
1 parent 6eb597a commit 75e58c95083ed983d1b12e92ff34f4c11ee98879 @chillu chillu committed Dec 4, 2012
Showing with 5 additions and 1 deletion.
  1. +5 −1 code/ModelAdmin.php
View
@@ -696,7 +696,11 @@ function getResultColumns($searchCriteria, $selectedOnly = true) {
$summaryFields = $this->columnsAvailable();
- if($selectedOnly && isset($searchCriteria['ResultAssembly'])) {
+ if(
+ $selectedOnly
+ && isset($searchCriteria['ResultAssembly'])
+ && !empty($searchCriteria['ResultAssembly'])
+ ) {
$resultAssembly = $searchCriteria['ResultAssembly'];
if(!is_array($resultAssembly)) {
$explodedAssembly = split(' *, *', $resultAssembly);

0 comments on commit 75e58c9

Please sign in to comment.