mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-18 04:22:10 +02:00
Code Issues Releases Wiki Activity

Bump version to 3.0.126 plus some other minor adjustments

Browse Source
This commit is contained in:
Ryan Cramer
2019-02-15 14:31:26 -05:00
parent 33bac98b83
commit 2c3e949d6e
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wire/core/ProcessWire.php
View File

@@ -44,7 +44,7 @@ class ProcessWire extends Wire {
* Reversion revision number * Reversion revision number
* *
*/ */
const versionRevision = 125; const versionRevision = 126;
/** /**
* Version suffix string (when applicable) * Version suffix string (when applicable)

2
wire/modules/AdminTheme/AdminThemeUikit/uikit/dist/css/uikit.pw.css vendored
View File

@@ -15192,7 +15192,7 @@ em {
color: inherit; color: inherit;
} }
#pw-mastheads { #pw-mastheads {
position: relative; /*position: relative;*/
} }
#pw-masthead, #pw-masthead,
#pw-masthead-mobile { #pw-masthead-mobile {

2
wire/modules/AdminTheme/AdminThemeUikit/uikit/dist/css/uikit.pw.min.css vendored
View File

File diff suppressed because one or more lines are too long

10
wire/modules/Inputfield/InputfieldSelect.module
View File

@@ -240,6 +240,8 @@ class InputfieldSelect extends Inputfield {
protected function addOptionLabelsString($str, $languageID = 0) { protected function addOptionLabelsString($str, $languageID = 0) {
foreach(explode("\n", $str) as $line) { foreach(explode("\n", $str) as $line) {
$line = trim($line); $line = trim($line);
$line = ltrim($line, '+');
if(strpos($line, 'disabled:') === 0) list(,$line) = explode('disabled:', $line, 2);
if(!strpos($line, '=')) continue; // 0 or false OK if(!strpos($line, '=')) continue; // 0 or false OK
list($key, $label) = explode('=', $line, 2); list($key, $label) = explode('=', $line, 2);
if($languageID) { if($languageID) {
@@ -326,8 +328,12 @@ class InputfieldSelect extends Inputfield {
if($this instanceof InputfieldHasArrayValue) { if($this instanceof InputfieldHasArrayValue) {
// multiple selection // multiple selection
/** @var InputfieldSelect $this */ $selected = false;
return in_array($value, $this->attr('value')); foreach($valueAttr as $v) {
$selected = "$v" === "$value";
if($selected) break;
}
return $selected;
} }
return "$value" == (string) $this->value; return "$value" == (string) $this->value;

3
wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module
View File

@@ -853,6 +853,9 @@ class ProcessPageEdit extends Process implements WirePageEditor, ConfigurableMod
$tabWrap->attr('title', $tabOpen->getSetting('label')); $tabWrap->attr('title', $tabOpen->getSetting('label'));
$tabWrap->id = $tabOpen->attr('id'); $tabWrap->id = $tabOpen->attr('id');
$tabWrap->collapsed = $tabOpen->getSetting('collapsed'); $tabWrap->collapsed = $tabOpen->getSetting('collapsed');
// @todo support description in fieldset tab: works but needs styles for each admin theme, so commented out for now
// $tabWrap->description = $inputfield->description;
$tabWrap->notes = $inputfield->notes;
$contentTab->remove($inputfield); $contentTab->remove($inputfield);
if(!$tabViewable) continue; if(!$tabViewable) continue;