Merge pull request #1229 from xwp/release/3.6.2

Release 3.6.2 (hotfix)

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;

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

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",

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)

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+