Merge remote-tracking branch 'origin/fix/release-tagging' into bugfix/release-tagging

# Conflicts:
#	local/scripts/dist.sh

Author: kasparsd

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

@@ -23,7 +23,8 @@
     "wp-phpunit/wp-phpunit": "^5.4",
     "wpsh/local": "^0.2.3",
     "wpackagist-plugin/advanced-custom-fields": "5.8.12",
-    "wpackagist-plugin/easy-digital-downloads": "^2.9.23"
+    "wpackagist-plugin/easy-digital-downloads": "^2.9.23",
+    "wpackagist-plugin/user-switching": "^1.5.5"
   },
   "config": {
     "process-timeout": 600,