Skip to content

Release 3.6.2 (hotfix) #1229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kasparsd merged 6 commits into from
Feb 12, 2021
Merged

Release 3.6.2 (hotfix) #1229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f108463
Update dependency eslint to ^7.19.0
renovate-bot Feb 11, 2021
6315611
Default settings error fix
kidunot89 Feb 11, 2021
3b107a5
Merge pull request #1227 from xwp/hotfix/release/3.6.1
Feb 12, 2021
d0988ea
Merge remote-tracking branch 'origin/master' into release/3.6.2
kasparsd Feb 12, 2021
7c60a85
Readme bump
kasparsd Feb 12, 2021
cc7af61
Version bump everywhere
kasparsd Feb 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion classes/class-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion classes/class-plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Plugin {
*
* @const string
*/
const VERSION = '3.6.1';
const VERSION = '3.6.2';

/**
* WP-CLI command
Expand Down
38 changes: 20 additions & 18 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 6 additions & 2 deletions readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion stream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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+
Expand Down