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

Merge remote-tracking branch 'origin/master' into add/in-app-purchases-subs-cache-cleaning

This commit is contained in:
tgglv 2019-10-17 09:52:41 +05:00
parent 34e873ca33 0112ee58a3
commit b3c5dec0e7
10 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/-----security-issue.md → .github/ISSUE_TEMPLATE/1-Security-issue.md vendored
View File

@ -1,5 +1,5 @@
---
name: "\U0001F46E‍♂️Security issue"
name: "\U0001F46E‍♂️ Security issue"
about: Please report security issues *only* via https://www.hackerone.com
title: ''
labels: ''

10
.github/ISSUE_TEMPLATE/2-External-issues.md vendored Normal file
View File

@ -0,0 +1,10 @@
---
name: "\U0001F47D External issues"
about: Please report WooCommerce REST API or WooCommerce Gutenberg Products Blocks issues directly to their respective repositories.
title: ''
labels: ''
assignees: ''
---
Please report WooCommerce REST API (https://github.com/woocommerce/woocommerce-rest-api) or WooCommerce Gutenberg Products Blocks (https://github.com/woocommerce/woocommerce-gutenberg-products-block) issues directly to their respective repositories.

0
.github/ISSUE_TEMPLATE/Support.md → .github/ISSUE_TEMPLATE/3-Support.md vendored
View File

0
.github/ISSUE_TEMPLATE/Bug_report.md → .github/ISSUE_TEMPLATE/4-Bug-report.md vendored
View File

0
.github/ISSUE_TEMPLATE/Enhancement.md → .github/ISSUE_TEMPLATE/5-Enhancement.md vendored
View File

0
.github/ISSUE_TEMPLATE/Feature_request.md → .github/ISSUE_TEMPLATE/6-Feature-request.md vendored
View File

2
composer.json
View File

@ -15,7 +15,7 @@
},
"require-dev": {
"phpunit/phpunit": "7.5.16",
"woocommerce/woocommerce-sniffs": "0.0.7"
"woocommerce/woocommerce-sniffs": "0.0.8"
},
"config": {
"platform": {

32
composer.lock generated
View File

@ -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": "5ee20699a045c2155fb5ca2244eff7e6",
"content-hash": "c955d86ce8d65e6fb1e0e97282642d7b",
"packages": [
{
"name": "automattic/jetpack-autoloader",
@ -637,16 +637,16 @@
},
{
"name": "phpcompatibility/phpcompatibility-wp",
"version": "2.0.0",
"version": "2.1.0",
"source": {
"type": "git",
"url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git",
"reference": "cb303f0067cd5b366a41d4fb0e254fb40ff02efd"
"reference": "41bef18ba688af638b7310666db28e1ea9158b2f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/cb303f0067cd5b366a41d4fb0e254fb40ff02efd",
"reference": "cb303f0067cd5b366a41d4fb0e254fb40ff02efd",
"url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/41bef18ba688af638b7310666db28e1ea9158b2f",
"reference": "41bef18ba688af638b7310666db28e1ea9158b2f",
"shasum": ""
},
"require": {
@ -654,10 +654,10 @@
"phpcompatibility/phpcompatibility-paragonie": "^1.0"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.3"
"dealerdirect/phpcodesniffer-composer-installer": "^0.5"
},
"suggest": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
"dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
"roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
},
"type": "phpcodesniffer-standard",
@ -683,7 +683,7 @@
"standards",
"wordpress"
],
"time": "2018-10-07T18:31:37+00:00"
"time": "2019-08-28T14:22:28+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@ -2001,23 +2001,23 @@
},
{
"name": "woocommerce/woocommerce-sniffs",
"version": "0.0.7",
"version": "0.0.8",
"source": {
"type": "git",
"url": "https://github.com/woocommerce/woocommerce-sniffs.git",
"reference": "ca80d02513adeea6f05a433bd6e1c29494f88ab1"
"reference": "ccdae93ba678d59cd9741bec077d0c63c0a82958"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/woocommerce/woocommerce-sniffs/zipball/ca80d02513adeea6f05a433bd6e1c29494f88ab1",
"reference": "ca80d02513adeea6f05a433bd6e1c29494f88ab1",
"url": "https://api.github.com/repos/woocommerce/woocommerce-sniffs/zipball/ccdae93ba678d59cd9741bec077d0c63c0a82958",
"reference": "ccdae93ba678d59cd9741bec077d0c63c0a82958",
"shasum": ""
},
"require": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
"dealerdirect/phpcodesniffer-composer-installer": "0.5.0",
"php": ">=7.0",
"phpcompatibility/phpcompatibility-wp": "2.0.0",
"wp-coding-standards/wpcs": "^2.1"
"phpcompatibility/phpcompatibility-wp": "2.1.0",
"wp-coding-standards/wpcs": "2.1.1"
},
"type": "phpcodesniffer-standard",
"notification-url": "https://packagist.org/downloads/",
@ -2037,7 +2037,7 @@
"woocommerce",
"wordpress"
],
"time": "2019-08-23T20:34:20+00:00"
"time": "2019-10-16T18:25:21+00:00"
},
{
"name": "wp-coding-standards/wpcs",

2
includes/admin/class-wc-admin-settings.php
View File

@ -187,7 +187,7 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
}
if ( is_array( $option_value ) ) {
$option_value = array_map( 'stripslashes', $option_value );
$option_value = wp_unslash( $option_value );
} elseif ( ! is_null( $option_value ) ) {
$option_value = stripslashes( $option_value );
}

2
includes/admin/meta-boxes/views/html-order-notes.php
View File

@ -22,7 +22,7 @@ defined( 'ABSPATH' ) || exit;
<?php echo wpautop( wptexturize( wp_kses_post( $note->content ) ) ); // @codingStandardsIgnoreLine ?>
</div>
<p class="meta">
<abbr class="exact-date" title="<?php echo esc_attr( $note->date_created->date( 'y-m-d h:i:s' ) ); ?>">
<abbr class="exact-date" title="<?php echo esc_attr( $note->date_created->date( 'Y-m-d H:i:s' ) ); ?>">
<?php
/* translators: %1$s: note date %2$s: note time */
echo esc_html( sprintf( __( '%1$s at %2$s', 'woocommerce' ), $note->date_created->date_i18n( wc_date_format() ), $note->date_created->date_i18n( wc_time_format() ) ) );