From fd89b7cebd2fbd8841f42007bb39b1e03130b982 Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Fri, 22 Nov 2019 14:12:51 -0500 Subject: [PATCH] Bump version to 3.0.146 --- wire/core/Fields.php | 2 +- wire/core/Fieldtype.php | 2 +- wire/core/Functions.php | 2 +- wire/core/Modules.php | 2 +- wire/core/Notices.php | 2 +- wire/core/Pages.php | 2 +- wire/core/PagesEditor.php | 6 +++--- wire/core/PaginatedArray.php | 2 ++ wire/core/ProcessWire.php | 2 +- wire/core/WireSaveableItems.php | 2 +- .../Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module | 2 +- 11 files changed, 14 insertions(+), 12 deletions(-) diff --git a/wire/core/Fields.php b/wire/core/Fields.php index 572757c0..0301ef88 100644 --- a/wire/core/Fields.php +++ b/wire/core/Fields.php @@ -161,7 +161,7 @@ class Fields extends WireSaveableItems { * @param array $a Associative array of data to populate * @return Saveable|Wire * @throws WireException - * @since 3.0.147 + * @since 3.0.146 * */ public function makeItem(array $a = array()) { diff --git a/wire/core/Fieldtype.php b/wire/core/Fieldtype.php index 05006451..41cb5b33 100644 --- a/wire/core/Fieldtype.php +++ b/wire/core/Fieldtype.php @@ -820,7 +820,7 @@ abstract class Fieldtype extends WireData implements Module { * * @param array $a Field data from DB (if needed) * @return string Return class name or blank to use default Field class - * @since 3.0.147 + * @since 3.0.146 * */ public function getFieldClass(array $a = array()) { diff --git a/wire/core/Functions.php b/wire/core/Functions.php index 6e47570f..c826a20c 100644 --- a/wire/core/Functions.php +++ b/wire/core/Functions.php @@ -1221,7 +1221,7 @@ function wireRegion($key, $value = null) { * * @param string $message Optional message to send to Exception message argument (not used in output by default) * @throws Wire404Exception - * @since 3.0.147 + * @since 3.0.146 * */ function wire404($message = '') { diff --git a/wire/core/Modules.php b/wire/core/Modules.php index 9836b37f..e2ba2e62 100644 --- a/wire/core/Modules.php +++ b/wire/core/Modules.php @@ -1592,7 +1592,7 @@ class Modules extends WireArray { * - Boolean false to return array of module names (default). * - Integer 1 to return array of module info for each matching module. * - Integer 2 to return array of verbose module info for each matching module. - * - Integer 3 to return array of Module or ModulePlaceholder objects (whatever current state is). Added 3.0.147. + * - Integer 3 to return array of Module or ModulePlaceholder objects (whatever current state is). Added 3.0.146. * @return array Returns array of module class names or Module objects. In either case, array indexes are class names. * */ diff --git a/wire/core/Notices.php b/wire/core/Notices.php index 51b93d34..43a17ed4 100644 --- a/wire/core/Notices.php +++ b/wire/core/Notices.php @@ -77,7 +77,7 @@ abstract class Notice extends WireData { /** * Indicate notice should not group/collapse with others of the same type (when supported by admin theme) * - * @since 3.0.147 + * @since 3.0.146 * */ const noGroup = 131072; diff --git a/wire/core/Pages.php b/wire/core/Pages.php index 80997da0..4cb32618 100644 --- a/wire/core/Pages.php +++ b/wire/core/Pages.php @@ -848,7 +848,7 @@ class Pages extends Wire { * * @param Page|PageArray|array $pages May be Page, PageArray or array of page IDs (integers). * @param null|int|string $time Omit (null) to update to now, or specify unix timestamp or strtotime() recognized time string - * @param string $type Date type to update, one of 'modified', 'created' or 'published' (default='modified') Added 3.0.147 + * @param string $type Date type to update, one of 'modified', 'created' or 'published' (default='modified') Added 3.0.146 * @throws WireException|\PDOException if given invalid format for $modified argument or failed database query * @return bool True on success, false on fail * @since 3.0.0 diff --git a/wire/core/PagesEditor.php b/wire/core/PagesEditor.php index ab7005b4..91415666 100644 --- a/wire/core/PagesEditor.php +++ b/wire/core/PagesEditor.php @@ -924,7 +924,7 @@ class PagesEditor extends Wire { * @param Page $page * @param int $status Use Page::status* constants * @return bool - * @since 3.0.147 + * @since 3.0.146 * @see PagesEditor::setStatus(), PagesEditor::removeStatus() * */ @@ -942,7 +942,7 @@ class PagesEditor extends Wire { * @param Page $page * @param int $status Use Page::status* constants * @return bool - * @since 3.0.147 + * @since 3.0.146 * @see PagesEditor::setStatus(), PagesEditor::addStatus(), PagesEditor::saveStatus() * */ @@ -958,7 +958,7 @@ class PagesEditor extends Wire { * * @param Page $page * @return bool - * @since 3.0.147 + * @since 3.0.146 * */ public function saveStatus(Page $page) { diff --git a/wire/core/PaginatedArray.php b/wire/core/PaginatedArray.php index 766bbcfe..e94612ae 100644 --- a/wire/core/PaginatedArray.php +++ b/wire/core/PaginatedArray.php @@ -276,6 +276,8 @@ class PaginatedArray extends WireArray implements WirePaginatable { $limit = $options['limit'] > -1 ? $options['limit'] : $this->getLimit(); $total = $options['total'] > -1 ? $options['total'] : $this->getTotal(); + if($count > $total) $total = $count; + if(empty($total) && !empty($options['zeroLabel'])) { $str = $options['zeroLabel']; diff --git a/wire/core/ProcessWire.php b/wire/core/ProcessWire.php index 85006a7d..eb9509b2 100644 --- a/wire/core/ProcessWire.php +++ b/wire/core/ProcessWire.php @@ -46,7 +46,7 @@ class ProcessWire extends Wire { * Reversion revision number * */ - const versionRevision = 145; + const versionRevision = 146; /** * Version suffix string (when applicable) diff --git a/wire/core/WireSaveableItems.php b/wire/core/WireSaveableItems.php index 3f5745fa..ae3fb85e 100644 --- a/wire/core/WireSaveableItems.php +++ b/wire/core/WireSaveableItems.php @@ -48,7 +48,7 @@ abstract class WireSaveableItems extends Wire implements \IteratorAggregate { * @param array $a Associative array of data to populate * @return Saveable|Wire * @throws WireException - * @since 3.0.147 + * @since 3.0.146 * */ public function makeItem(array $a = array()) { diff --git a/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module b/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module index a12a1703..a82ba806 100644 --- a/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module +++ b/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module @@ -207,7 +207,7 @@ class FieldtypeRepeater extends Fieldtype implements ConfigurableModule { * * @param array $a Field data from DB (if needed) * @return string Return class name or blank to use default Field class - * @since 3.0.147 + * @since 3.0.146 * */ public function getFieldClass(array $a = array()) {