Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/woocommerce/woocommerce

This commit is contained in:
Mike Jolley 2019-02-01 16:10:24 +00:00
parent b694dffd1c aeb64b62bf
commit ebabb0a767
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -12,7 +12,7 @@
"require-dev": { "require-dev": {
"apigen/apigen": "4.1.2", "apigen/apigen": "4.1.2",
"nette/utils": "2.5.3", "nette/utils": "2.5.3",
"phpunit/phpunit": "6.5.13", "phpunit/phpunit": "6.5.14",
"woocommerce/woocommerce-sniffs": "0.0.5" "woocommerce/woocommerce-sniffs": "0.0.5"
}, },
"scripts": { "scripts": {

14
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "291b6e5b4c860eeb4cf1caa6529a21e7", "content-hash": "67b8066152baf2f08393562b576da266",
"packages": [ "packages": [
{ {
"name": "composer/installers", "name": "composer/installers",
@ -2666,16 +2666,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "6.5.13", "version": "6.5.14",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "0973426fb012359b2f18d3bd1e90ef1172839693" "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0973426fb012359b2f18d3bd1e90ef1172839693", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bac23fe7ff13dbdb461481f706f0e9fe746334b7",
"reference": "0973426fb012359b2f18d3bd1e90ef1172839693", "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2746,7 +2746,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2018-09-08T15:10:43+00:00" "time": "2019-02-01T05:22:47+00:00"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
@ -3731,7 +3731,7 @@
}, },
{ {
"name": "Gert de Pagter", "name": "Gert de Pagter",
"email": "BackEndTea@gmail.com" "email": "backendtea@gmail.com"
} }
], ],
"description": "Symfony polyfill for ctype functions", "description": "Symfony polyfill for ctype functions",

12
includes/admin/views/html-admin-page-status-report.php
View File

@ -55,15 +55,15 @@ $untested_plugins = $plugin_updates->get_untested_plugins( WC()->version, 'minor
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td data-export-label="Home URL"><?php esc_html_e( 'Home URL', 'woocommerce' ); ?>:</td> <td data-export-label="WordPress address (URL)"><?php esc_html_e( 'WordPress address (URL)', 'woocommerce' ); ?>:</td>
<td class="help"><?php echo wc_help_tip( esc_html__( 'The homepage URL of your site.', 'woocommerce' ) ); /* phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped */ ?></td>
<td><?php echo esc_html( $environment['home_url'] ); ?></td>
</tr>
<tr>
<td data-export-label="Site URL"><?php esc_html_e( 'Site URL', 'woocommerce' ); ?>:</td>
<td class="help"><?php echo wc_help_tip( esc_html__( 'The root URL of your site.', 'woocommerce' ) ); /* phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped */ ?></td> <td class="help"><?php echo wc_help_tip( esc_html__( 'The root URL of your site.', 'woocommerce' ) ); /* phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped */ ?></td>
<td><?php echo esc_html( $environment['site_url'] ); ?></td> <td><?php echo esc_html( $environment['site_url'] ); ?></td>
</tr> </tr>
<tr>
<td data-export-label="Site address (URL)"><?php esc_html_e( 'Site address (URL)', 'woocommerce' ); ?>:</td>
<td class="help"><?php echo wc_help_tip( esc_html__( 'The homepage URL of your site.', 'woocommerce' ) ); /* phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped */ ?></td>
<td><?php echo esc_html( $environment['home_url'] ); ?></td>
</tr>
<tr> <tr>
<td data-export-label="WC Version"><?php esc_html_e( 'WooCommerce version', 'woocommerce' ); ?>:</td> <td data-export-label="WC Version"><?php esc_html_e( 'WooCommerce version', 'woocommerce' ); ?>:</td>
<td class="help"><?php echo wc_help_tip( esc_html__( 'The version of WooCommerce installed on your site.', 'woocommerce' ) ); /* phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped */ ?></td> <td class="help"><?php echo wc_help_tip( esc_html__( 'The version of WooCommerce installed on your site.', 'woocommerce' ) ); /* phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped */ ?></td>

8
includes/class-wc-query.php
View File

@ -515,7 +515,7 @@ class WC_Query {
global $wpdb, $wp_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' ) ) { 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( array(
'taxonomy' => $wp_query->queried_object->taxonomy, 'taxonomy' => $wp_query->queried_object->taxonomy,
'child_of' => $wp_query->queried_object->term_id, 'child_of' => $wp_query->queried_object->term_id,
@ -550,7 +550,7 @@ class WC_Query {
global $wpdb, $wp_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' ) ) { 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( array(
'taxonomy' => $wp_query->queried_object->taxonomy, 'taxonomy' => $wp_query->queried_object->taxonomy,
'child_of' => $wp_query->queried_object->term_id, 'child_of' => $wp_query->queried_object->term_id,
@ -601,7 +601,9 @@ class WC_Query {
if ( ! is_array( $meta_query ) ) { if ( ! is_array( $meta_query ) ) {
$meta_query = array(); $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 ) ); return array_filter( apply_filters( 'woocommerce_product_query_meta_query', $meta_query, $this ) );
} }