From f108463d5a090ce281bb955776a62cbf4796089b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 11 Feb 2021 14:45:55 +0000 Subject: [PATCH 1/4] Update dependency eslint to ^7.19.0 --- package-lock.json | 38 ++++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 33c3a1e2e..0ca23022d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -298,6 +298,14 @@ "globals": "^12.0.0", "prettier": "npm:wp-prettier@2.2.1-beta-1", "requireindex": "^1.2.0" + }, + "dependencies": { + "prettier": { + "version": "npm:wp-prettier@2.2.1-beta-1", + "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz", + "integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==", + "dev": true + } } }, "@wordpress/prettier-config": { @@ -1135,9 +1143,9 @@ "dev": true }, "eslint": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz", - "integrity": "sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.19.0.tgz", + "integrity": "sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -1441,9 +1449,9 @@ "dev": true }, "esquery": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz", - "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", + "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", "dev": true, "requires": { "estraverse": "^5.1.0" @@ -1802,9 +1810,9 @@ } }, "flatted": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz", - "integrity": "sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz", + "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==", "dev": true }, "for-in": { @@ -3426,12 +3434,6 @@ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true }, - "prettier": { - "version": "npm:wp-prettier@2.2.1-beta-1", - "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz", - "integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==", - "dev": true - }, "prettier-linter-helpers": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", @@ -4108,9 +4110,9 @@ }, "dependencies": { "ajv": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.0.3.tgz", - "integrity": "sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.1.0.tgz", + "integrity": "sha512-svS9uILze/cXbH0z2myCK2Brqprx/+JJYK5pHicT/GQiBfzzhUVAIT6MwqJg8y4xV/zoGsUeuPuwtoiKSGE15g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", diff --git a/package.json b/package.json index 3d36a7829..68c1ee8c4 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ ], "devDependencies": { "@wordpress/eslint-plugin": "^7.4.0", - "eslint": "^7.18.0", + "eslint": "^7.19.0", "grunt": "~1.3.0", "grunt-contrib-clean": "~2.0.0", "grunt-contrib-compress": "^2.0.0", From 631561125bad26b124bc55a4b637f13f45deecda Mon Sep 17 00:00:00 2001 From: Geoff Taylor Date: Thu, 11 Feb 2021 18:10:22 -0500 Subject: [PATCH 2/4] Default settings error fix --- classes/class-admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/class-admin.php b/classes/class-admin.php index 15148bfab..947c47af5 100644 --- a/classes/class-admin.php +++ b/classes/class-admin.php @@ -143,7 +143,7 @@ public function __construct( $plugin ) { add_filter( 'role_has_cap', array( $this, 'filter_role_caps' ), 10, 3 ); if ( is_multisite() && $plugin->is_network_activated() && ! is_network_admin() ) { - $options = (array) get_site_option( 'wp_stream_network', $plugin->settings->get_defaults() ); + $options = (array) get_site_option( 'wp_stream_network', array() ); $option = isset( $options['general_site_access'] ) ? absint( $options['general_site_access'] ) : 1; $this->disable_access = ( $option ) ? false : true; From 7c60a850373bb1414b23569f1144915582456335 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Fri, 12 Feb 2021 08:21:36 +0200 Subject: [PATCH 3/4] Readme bump --- readme.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/readme.txt b/readme.txt index bc6bde65e..9e9732d28 100644 --- a/readme.txt +++ b/readme.txt @@ -2,8 +2,8 @@ Contributors: xwp Tags: wp stream, stream, activity, logs, track Requires at least: 4.5 -Tested up to: 5.5 -Stable tag: 3.6.1 +Tested up to: 5.6 +Stable tag: 3.6.2 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html @@ -91,6 +91,10 @@ Past Contributors: fjarrett, shadyvb, chacha, westonruter, johnregan3, jacobschw == Changelog == += 3.6.2 - January 12, 2020 = + +* Fix: revert [#1159](https://github.com/xwp/stream/pull/1159) which caused a PHP error in the previous release. + = 3.6.1 - January 12, 2020 = * New: Action add for when a blog is deleted [#1177](https://github.com/xwp/stream/pull/1177), props [@kidunot89](https://github.com/kidunot89) From cc7af6191f02224071cf9a17cd755287a1a72656 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Fri, 12 Feb 2021 08:22:17 +0200 Subject: [PATCH 4/4] Version bump everywhere --- classes/class-plugin.php | 2 +- stream.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/class-plugin.php b/classes/class-plugin.php index 3422e35e0..380b2780f 100755 --- a/classes/class-plugin.php +++ b/classes/class-plugin.php @@ -18,7 +18,7 @@ class Plugin { * * @const string */ - const VERSION = '3.6.1'; + const VERSION = '3.6.2'; /** * WP-CLI command diff --git a/stream.php b/stream.php index c1905ff98..56c172e23 100644 --- a/stream.php +++ b/stream.php @@ -3,7 +3,7 @@ * Plugin Name: Stream * Plugin URI: https://xwp.co/work/stream/ * Description: Stream tracks logged-in user activity so you can monitor every change made on your WordPress site in beautifully organized detail. All activity is organized by context, action and IP address for easy filtering. Developers can extend Stream with custom connectors to log any kind of action. - * Version: 3.6.1 + * Version: 3.6.2 * Author: XWP * Author URI: https://xwp.co * License: GPLv2+