diff --git a/wire/core/Modules.php b/wire/core/Modules.php index f7a43758..5ff9b9b7 100644 --- a/wire/core/Modules.php +++ b/wire/core/Modules.php @@ -1000,7 +1000,7 @@ class Modules extends WireArray { // check if module has already been loaded, or maybe we've got duplicates if(wireClassExists($basename, false)) { $module = parent::get($basename); - $dir = rtrim($this->wire('config')->paths->$basename, '/'); + $dir = rtrim((string) $this->wire()->config->paths->$basename, '/'); if($module && $dir && $dirname != $dir) { $duplicates->recordDuplicate($basename, $pathname, "$dir/$filename", $installed); return ''; diff --git a/wire/modules/AdminTheme/AdminThemeUikit/install-foot.inc b/wire/modules/AdminTheme/AdminThemeUikit/install-foot.inc index 5d0f37bc..88851482 100644 --- a/wire/modules/AdminTheme/AdminThemeUikit/install-foot.inc +++ b/wire/modules/AdminTheme/AdminThemeUikit/install-foot.inc @@ -10,7 +10,7 @@ if(!defined("PROCESSWIRE_INSTALL")) die(); diff --git a/wire/modules/Fieldtype/FieldtypeOptions/SelectableOptionConfig.php b/wire/modules/Fieldtype/FieldtypeOptions/SelectableOptionConfig.php index 275ac355..a4bfbadb 100644 --- a/wire/modules/Fieldtype/FieldtypeOptions/SelectableOptionConfig.php +++ b/wire/modules/Fieldtype/FieldtypeOptions/SelectableOptionConfig.php @@ -210,6 +210,7 @@ class SelectableOptionConfig extends Wire { $f->label = $this->_('What options do you want pre-selected? (if any)'); $f->collapsed = Inputfield::collapsedBlank; $f->description = sprintf($this->_('This field also serves as a preview of your selected input type (%s) and options.'), $inputfieldClass); + if(!$f instanceof InputfieldHasArrayValue) $f->addOption('', $this->_('None')); foreach($options as $option) { $f->addOption($option->id, $option->title); }