mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-12 09:44:38 +02:00
Code Issues Releases Wiki Activity

Various minor fixes

Browse Source
This commit is contained in:
Ryan Cramer
2022-03-11 13:27:31 -05:00
parent 989b94e532
commit d743606b70
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wire/core/Modules.php
View File

@@ -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 '';

2
wire/modules/AdminTheme/AdminThemeUikit/install-foot.inc
View File

@@ -10,7 +10,7 @@ if(!defined("PROCESSWIRE_INSTALL")) die();
<!-- FOOTER -->
<footer id='pw-footer' class='uk-margin'>
<div class='pw-container uk-container uk-container-center'>
<p>ProcessWire 3.x &copy; 2021</p>
<p>ProcessWire 3.x &copy; 2022</p>
</div>
</footer>

1
wire/modules/Fieldtype/FieldtypeOptions/SelectableOptionConfig.php
View File

@@ -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);
}