Skip to content

Commit 88b7840

Browse files
author
Kaspars Dambis
authored
Merge pull request #1193 from xwp/release/3.6.0
Version 3.6.0
2 parents 1847504 + aba3a21 commit 88b7840

23 files changed

+2808
-393
lines changed

classes/class-list-table.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function extra_tablenav( $which ) {
9999
public function no_items() {
100100
?>
101101
<div class="stream-list-table-no-items">
102-
<p><?php esc_html_e( 'Sorry, no activity records were found.', 'stream' ); ?></p>
102+
<p><?php esc_html_e( 'No activity records were found.', 'stream' ); ?></p>
103103
</div>
104104
<?php
105105
}

classes/class-plugin.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Plugin {
1818
*
1919
* @const string
2020
*/
21-
const VERSION = '3.5.1';
21+
const VERSION = '3.6.0';
2222

2323
/**
2424
* WP-CLI command

classes/class-query.php

+10
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,16 @@ public function query( $args ) {
216216

217217
$select = implode( ', ', $selects );
218218

219+
/**
220+
* Filters query WHERE statement as an alternative to filtering
221+
* the $query using the hook below.
222+
*
223+
* @param string $where WHERE statement.
224+
*
225+
* @return string
226+
*/
227+
$where = apply_filters( 'wp_stream_db_query_where', $where );
228+
219229
/**
220230
* BUILD THE FINAL QUERY
221231
*/

composer.json

+14-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
"homepage": "https://wordpress.org/plugins/stream/",
55
"type": "wordpress-plugin",
66
"license": "GPL-2.0-or-later",
7+
"repositories": [
8+
{
9+
"type":"composer",
10+
"url":"https://wpackagist.org"
11+
}
12+
],
713
"require": {
814
"composer/installers": "~1.0"
915
},
@@ -15,7 +21,10 @@
1521
"wp-cli/wp-cli-bundle": "^2.2",
1622
"wp-coding-standards/wpcs": "^2.2",
1723
"wp-phpunit/wp-phpunit": "^5.4",
18-
"wpsh/local": "^0.2.3"
24+
"wpsh/local": "^0.2.3",
25+
"wpackagist-plugin/advanced-custom-fields": "5.8.12",
26+
"wpackagist-plugin/easy-digital-downloads": "^2.9.23",
27+
"wpackagist-plugin/user-switching": "^1.5.5"
1928
},
2029
"config": {
2130
"process-timeout": 600,
@@ -25,7 +34,10 @@
2534
}
2635
},
2736
"extra": {
28-
"wordpress-install-dir": "local/public"
37+
"wordpress-install-dir": "local/public",
38+
"installer-paths": {
39+
"local/public/wp-content/plugins/{$name}/": ["type:wordpress-plugin"]
40+
}
2941
},
3042
"scripts": {
3143
"release": [

0 commit comments

Comments
 (0)