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 github.com:woothemes/woocommerce

This commit is contained in:
Claudio Sanches 2016-09-13 17:45:57 -03:00
parent 0d803ef5a1 c76e8cdb8d
commit 08b8fe0ed3
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,7 +290,7 @@ class WC_Admin_Taxonomies {
* Description for product_cat page to aid users.
*/
public function product_cat_description() {
echo wpautop( __( 'Product categories for your store can be managed here. To change the order of categories on the front-end you can drag and drop to sort them. To see more categories listed click the "screen options" link at the top of the page.', 'woocommerce' ) );
echo wpautop( __( 'Product categories for your store can be managed here. To change the order of categories on the front-end you can drag and drop to sort them. To see more categories listed click the "screen options" link at the top-right of this page.', 'woocommerce' ) );
}
/**

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

@ -108,7 +108,7 @@ class WC_Settings_Payment_Gateways extends WC_Settings_Page {
'type' => 'checkbox',
'checkboxgroup' => '',
'show_if_checked' => 'option',
'desc_tip' => __( 'Force SSL (HTTPS) on the checkout pages (an SSL Certificate is required).', 'woocommerce' ),
'desc_tip' => sprintf( __( 'Force SSL (HTTPS) on the checkout pages (%1$san SSL Certificate is required%2$s).', 'woocommerce' ), '<a href="https://docs.woocommerce.com/document/ssl-and-https/#section-3" target="_blank">', '</a>' )
),
'unforce_ssl_checkout' => array(

2
includes/admin/views/html-admin-page-addons.php
View File

@ -42,7 +42,7 @@ if ( ! defined( 'ABSPATH' ) ) {
</ul>
<?php endif; ?>
<?php else : ?>
<p><?php printf( __( 'Our catalog of WooCommerce Extensions can be found on WooThemes.com here: <a href="%s">WooCommerce Extensions Catalog</a>', 'woocommerce' ), 'https://woocommerce.com/product-category/woocommerce-extensions/' ); ?></p>
<p><?php printf( __( 'Our catalog of WooCommerce Extensions can be found on WooCommerce.com here: <a href="%s">WooCommerce Extensions Catalog</a>', 'woocommerce' ), 'https://woocommerce.com/product-category/woocommerce-extensions/' ); ?></p>
<?php endif; ?>
<?php if ( 'Storefront' !== $theme['Name'] ) : ?>

7
includes/class-wc-logger.php
View File

@ -53,8 +53,13 @@ class WC_Logger {
return true;
}
if ( $this->_handles[ $handle ] = @fopen( wc_get_log_file_path( $handle ), $mode ) ) {
if ( ! file_exists( wc_get_log_file_path( $handle ) ) ) {
$temphandle = @fopen( wc_get_log_file_path( $handle ), 'w+' );
@fclose( $temphandle );
@chmod( wc_get_log_file_path( $handle ), FS_CHMOD_FILE );
}
if ( $this->_handles[ $handle ] = @fopen( wc_get_log_file_path( $handle ), $mode ) ) {
return true;
}

8
includes/class-wc-shipping-zone.php
View File

@ -54,6 +54,14 @@ class WC_Shipping_Zone extends WC_Data {
}
}
/**
* Returns all data for this object.
* @return array
*/
public function get_data() {
return array_merge( array( 'id' => $this->get_id(), 'zone_id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
}
/**
* Insert zone into the database
*/

4
tests/unit-tests/settings/register-wp-admin-settings.php
View File

@ -176,7 +176,7 @@ class WC_Tests_Register_WP_Admin_Settings extends WC_Unit_Test_Case {
/**
* @since 2.7.0
* @covers WC_Register_WP_Admin_Settings::register_settings
* @covers WC_Register_WP_Admin_Settings::register_page_settings
*/
public function test_register_settings_one_section() {
$this->page
@ -200,7 +200,7 @@ class WC_Tests_Register_WP_Admin_Settings extends WC_Unit_Test_Case {
/**
* @since 2.7.0
* @covers WC_Register_WP_Admin_Settings::register_settings
* @covers WC_Register_WP_Admin_Settings::register_page_settings
*/
public function test_register_settings() {
$this->page