From 1b059b0ced048b73588fd4b060bee9cda087c49d Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Fri, 14 Dec 2018 14:24:50 -0500 Subject: [PATCH] Bump version to 3.0.122 plus some other minor adjustments --- wire/core/ProcessWire.php | 2 +- .../Inputfield/InputfieldCheckbox.module | 2 +- .../InputfieldSubmit/InputfieldSubmit.module | 25 ++++++++++++++++++- .../ProcessPageLister.module | 4 +-- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/wire/core/ProcessWire.php b/wire/core/ProcessWire.php index ee9c613a..c427a566 100644 --- a/wire/core/ProcessWire.php +++ b/wire/core/ProcessWire.php @@ -44,7 +44,7 @@ class ProcessWire extends Wire { * Reversion revision number * */ - const versionRevision = 121; + const versionRevision = 122; /** * Version suffix string (when applicable) diff --git a/wire/modules/Inputfield/InputfieldCheckbox.module b/wire/modules/Inputfield/InputfieldCheckbox.module index 2c1ac76b..04fb534c 100644 --- a/wire/modules/Inputfield/InputfieldCheckbox.module +++ b/wire/modules/Inputfield/InputfieldCheckbox.module @@ -90,7 +90,7 @@ class InputfieldCheckbox extends Inputfield { $attrs['value'] = $this->checkedValue; if($this->getSetting('entityEncodeLabel') !== false) { - $label = $this->entityEncode($label); + $label = $this->entityEncode($label, Inputfield::textFormatBasic); } $out = diff --git a/wire/modules/Inputfield/InputfieldSubmit/InputfieldSubmit.module b/wire/modules/Inputfield/InputfieldSubmit/InputfieldSubmit.module index abf5756f..69011347 100644 --- a/wire/modules/Inputfield/InputfieldSubmit/InputfieldSubmit.module +++ b/wire/modules/Inputfield/InputfieldSubmit/InputfieldSubmit.module @@ -24,6 +24,14 @@ class InputfieldSubmit extends Inputfield { ); } + /** + * Names of submit buttons created + * + * @var array + * + */ + protected static $submitNames = array(); + /** * Additional dropdown actions added to the button * @@ -63,7 +71,12 @@ class InputfieldSubmit extends Inputfield { if($key == 'secondary') return $this->hasClass('ui-priority-secondary'); return parent::get($key); } - + + public function setAttribute($key, $value) { + if($key === 'name') self::$submitNames[$value] = $value; + return parent::setAttribute($key, $value); + } + /** * Show another copy of this button in the header? * @@ -263,4 +276,14 @@ class InputfieldSubmit extends Inputfield { $this->addActionItem('link', $url, $label, $icon); } + /** + * #pw-internal + * + * @return array() + * + */ + static public function getSubmitNames() { + return self::$submitNames; + } + } diff --git a/wire/modules/Process/ProcessPageLister/ProcessPageLister.module b/wire/modules/Process/ProcessPageLister/ProcessPageLister.module index fe4ec3f7..1acac247 100644 --- a/wire/modules/Process/ProcessPageLister/ProcessPageLister.module +++ b/wire/modules/Process/ProcessPageLister/ProcessPageLister.module @@ -536,7 +536,7 @@ class ProcessPageLister extends Process implements ConfigurableModule { * Set a Lister session variable * * @param string $key - * @param string|int $value + * @param string|int|array $value * */ public function sessionSet($key, $value) { @@ -549,7 +549,7 @@ class ProcessPageLister extends Process implements ConfigurableModule { * Get a Lister session variable * * @param string $key - * @return string|int|null + * @return string|int|array|null * */ public function sessionGet($key) {