diff --git a/composer.json b/composer.json index 6b96d22c33d..83359209593 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "require-dev": { "apigen/apigen": "4.1.2", "nette/utils": "2.5.3", - "phpunit/phpunit": "6.5.13", + "phpunit/phpunit": "6.5.14", "woocommerce/woocommerce-sniffs": "0.0.5" }, "scripts": { diff --git a/composer.lock b/composer.lock index 08825d6cc6e..a140bb4df0c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "291b6e5b4c860eeb4cf1caa6529a21e7", + "content-hash": "67b8066152baf2f08393562b576da266", "packages": [ { "name": "composer/installers", @@ -2666,16 +2666,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.5.13", + "version": "6.5.14", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "0973426fb012359b2f18d3bd1e90ef1172839693" + "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0973426fb012359b2f18d3bd1e90ef1172839693", - "reference": "0973426fb012359b2f18d3bd1e90ef1172839693", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bac23fe7ff13dbdb461481f706f0e9fe746334b7", + "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7", "shasum": "" }, "require": { @@ -2746,7 +2746,7 @@ "testing", "xunit" ], - "time": "2018-09-08T15:10:43+00:00" + "time": "2019-02-01T05:22:47+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -3731,7 +3731,7 @@ }, { "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" + "email": "backendtea@gmail.com" } ], "description": "Symfony polyfill for ctype functions", diff --git a/includes/admin/views/html-admin-page-status-report.php b/includes/admin/views/html-admin-page-status-report.php index a1ed0b386a5..201b4e9db27 100644 --- a/includes/admin/views/html-admin-page-status-report.php +++ b/includes/admin/views/html-admin-page-status-report.php @@ -55,15 +55,15 @@ $untested_plugins = $plugin_updates->get_untested_plugins( WC()->version, 'minor - : - - - - - : + : + + : + + + : diff --git a/includes/class-wc-query.php b/includes/class-wc-query.php index e60979b2d98..3c88200ef9e 100644 --- a/includes/class-wc-query.php +++ b/includes/class-wc-query.php @@ -515,7 +515,7 @@ class WC_Query { global $wpdb, $wp_query; if ( isset( $wp_query->queried_object, $wp_query->queried_object->term_taxonomy_id, $wp_query->queried_object->taxonomy ) && is_a( $wp_query->queried_object, 'WP_Term' ) ) { - $search_within_terms = get_terms( + $search_within_terms = get_terms( array( 'taxonomy' => $wp_query->queried_object->taxonomy, 'child_of' => $wp_query->queried_object->term_id, @@ -550,7 +550,7 @@ class WC_Query { global $wpdb, $wp_query; if ( isset( $wp_query->queried_object, $wp_query->queried_object->term_taxonomy_id, $wp_query->queried_object->taxonomy ) && is_a( $wp_query->queried_object, 'WP_Term' ) ) { - $search_within_terms = get_terms( + $search_within_terms = get_terms( array( 'taxonomy' => $wp_query->queried_object->taxonomy, 'child_of' => $wp_query->queried_object->term_id, @@ -601,7 +601,9 @@ class WC_Query { if ( ! is_array( $meta_query ) ) { $meta_query = array(); } - $meta_query['price_filter'] = $this->price_filter_meta_query(); + if ( $main_query ) { + $meta_query['price_filter'] = $this->price_filter_meta_query(); + } return array_filter( apply_filters( 'woocommerce_product_query_meta_query', $meta_query, $this ) ); }