Merge pull request #1193 from xwp/release/3.6.0

Version 3.6.0

classes/class-list-table.php

@@ -99,7 +99,7 @@ public function extra_tablenav( $which ) {
 	public function no_items() {
 		?>
 		<div class="stream-list-table-no-items">
-			<p><?php esc_html_e( 'Sorry, no activity records were found.', 'stream' ); ?></p>
+			<p><?php esc_html_e( 'No activity records were found.', 'stream' ); ?></p>
 		</div>
 		<?php
 	}

classes/class-plugin.php

@@ -18,7 +18,7 @@ class Plugin {
 	 *
 	 * @const string
 	 */
-	const VERSION = '3.5.1';
+	const VERSION = '3.6.0';
 
 	/**
 	 * WP-CLI command

classes/class-query.php

@@ -216,6 +216,16 @@ public function query( $args ) {
 
 		$select = implode( ', ', $selects );
 
+		/**
+		 * Filters query WHERE statement as an alternative to filtering
+		 * the $query using the hook below.
+		 *
+		 * @param string $where  WHERE statement.
+		 *
+		 * @return string
+		 */
+		$where = apply_filters( 'wp_stream_db_query_where', $where );
+
 		/**
 		 * BUILD THE FINAL QUERY
 		 */

composer.json

@@ -4,6 +4,12 @@
   "homepage": "https://wordpress.org/plugins/stream/",
   "type": "wordpress-plugin",
   "license": "GPL-2.0-or-later",
+  "repositories": [
+    {
+      "type":"composer",
+      "url":"https://wpackagist.org"
+    }
+  ],
   "require": {
     "composer/installers": "~1.0"
   },
@@ -15,7 +21,10 @@
     "wp-cli/wp-cli-bundle": "^2.2",
     "wp-coding-standards/wpcs": "^2.2",
     "wp-phpunit/wp-phpunit": "^5.4",
-    "wpsh/local": "^0.2.3"
+    "wpsh/local": "^0.2.3",
+    "wpackagist-plugin/advanced-custom-fields": "5.8.12",
+    "wpackagist-plugin/easy-digital-downloads": "^2.9.23",
+    "wpackagist-plugin/user-switching": "^1.5.5"
   },
   "config": {
     "process-timeout": 600,
@@ -25,7 +34,10 @@
     }
   },
   "extra": {
-    "wordpress-install-dir": "local/public"
+    "wordpress-install-dir": "local/public",
+    "installer-paths": {
+      "local/public/wp-content/plugins/{$name}/": ["type:wordpress-plugin"]
+    }
   },
   "scripts": {
     "release": [