From fa1b58c6a26944048901573ba4b8988caa2d08ad Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Mon, 24 Oct 2016 04:52:58 -0400 Subject: [PATCH] Minor adjustments --- .../Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module | 1 + wire/modules/Inputfield/InputfieldSelect.module | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module b/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module index fa5a1122..2fc3f055 100644 --- a/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module +++ b/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module @@ -692,6 +692,7 @@ class FieldtypeRepeater extends Fieldtype implements ConfigurableModule { public function ___exportValue(Page $page, Field $field, $value, array $options = array()) { $a = array(); + if(!WireArray::iterable($value)) return $a; foreach($value as $k => $p) { /** @var Page $p */ if($p->isUnpublished()) continue; diff --git a/wire/modules/Inputfield/InputfieldSelect.module b/wire/modules/Inputfield/InputfieldSelect.module index 6e45c580..26c10061 100644 --- a/wire/modules/Inputfield/InputfieldSelect.module +++ b/wire/modules/Inputfield/InputfieldSelect.module @@ -327,7 +327,7 @@ class InputfieldSelect extends Inputfield { * @return array * */ - protected function getOptionAttributes($key) { + public function getOptionAttributes($key) { if(!isset($this->optionAttributes[$key])) return array(); return $this->optionAttributes[$key]; } @@ -395,6 +395,7 @@ class InputfieldSelect extends Inputfield { public function get($key) { if($key == 'options') return $this->options; + if($key == 'optionAttributes') return $this->optionAttributes; return parent::get($key); }