check to ensure $values is not null or empty before exploding. Otherw…

…ise, return an empty array
silverstripe · Jun 5, 2015 · 9421374 · 9421374
1 parent d3b7abb
commit 9421374
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/forms/CheckboxSetField.php b/forms/CheckboxSetField.php
@@ -96,8 +96,12 @@ public function getOptions() {
 						}
 					}
 				} elseif($values && is_string($values)) {
-					$items = explode(',', $values);
-					$items = str_replace('{comma}', ',', $items);
+					if(!empty($values)) {
+						$items = explode(',', $values);
+						$items = str_replace('{comma}', ',', $items);
+					} else {
+						$items = array();
+					}
 				}
 			}
 		} else {
@@ -109,8 +113,12 @@ public function getOptions() {
 					$items = array();
 				}
 				else {
-					$items = explode(',', $values);
-					$items = str_replace('{comma}', ',', $items);
+					if(!empty($values)) {
+						$items = explode(',', $values);
+						$items = str_replace('{comma}', ',', $items);
+					} else {
+						$items = array();
+					}
 				}
 			}
 		}