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

Merge pull request woocommerce/woocommerce-admin#2543 from woocommerce/2503-followup 

Add error checking for failed remote gets added in woocommerce/woocommerce-admin#2503
This commit is contained in:
Ron Rennick 2019-07-02 10:54:15 -03:00 committed by GitHub
parent 80c5fa86d1 ac28e781c7
commit ca40be6676
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
plugins/woocommerce-admin/includes/features/onboarding/class-wc-admin-onboarding.php
View File

@ -118,31 +118,34 @@ class WC_Admin_Onboarding {
$themes_transient_name = 'wc_onboarding_themes';
$themes = get_transient( $themes_transient_name );
if ( false === $themes ) {
$theme_data = wp_remote_get( 'http://woocommerce.com/wp-json/wccom-extensions/1.0/search?category=themes' );
$theme_data = json_decode( $theme_data['body'] );
$theme_data = wp_remote_get( 'https://woocommerce.com/wp-json/wccom-extensions/1.0/search?category=themes' );
$themes = array();
foreach ( $theme_data->products as $theme ) {
$slug = sanitize_title( $theme->slug );
$themes[ $slug ] = (array) $theme;
$themes[ $slug ]['is_installed'] = false;
$themes[ $slug ]['has_woocommerce_support'] = true;
if ( ! is_wp_error( $theme_data ) ) {
$theme_data = json_decode( $theme_data['body'] );
foreach ( $theme_data->products as $theme ) {
$slug = sanitize_title( $theme->slug );
$themes[ $slug ] = (array) $theme;
$themes[ $slug ]['is_installed'] = false;
$themes[ $slug ]['has_woocommerce_support'] = true;
}
$installed_themes = wp_get_themes();
foreach ( $installed_themes as $slug => $theme ) {
$themes[ $slug ] = array(
'slug' => sanitize_title( $slug ),
'title' => $theme->get( 'Name' ),
'price' => '0.00',
'is_installed' => true,
'image' => $theme->get_screenshot(),
'has_woocommerce_support' => self::has_woocommerce_support( $theme ),
);
}
set_transient( $themes_transient_name, $themes, DAY_IN_SECONDS );
}
$installed_themes = wp_get_themes();
foreach ( $installed_themes as $slug => $theme ) {
$themes[ $slug ] = array(
'slug' => sanitize_title( $slug ),
'title' => $theme->get( 'Name' ),
'price' => '0.00',
'is_installed' => true,
'image' => $theme->get_screenshot(),
'has_woocommerce_support' => self::has_woocommerce_support( $theme ),
);
}
set_transient( $themes_transient_name, $themes, DAY_IN_SECONDS );
}
$themes = apply_filters( 'woocommerce_admin_onboarding_themes', $themes );
@ -181,8 +184,13 @@ class WC_Admin_Onboarding {
$woocommerce_products = get_transient( $product_data_transient_name );
if ( false === $woocommerce_products ) {
$woocommerce_products = wp_remote_get( 'https://woocommerce.com/wp-json/wccom-extensions/1.0/search?category=product-type' );
if ( is_wp_error( $woocommerce_products ) ) {
return $product_types;
}
set_transient( $product_data_transient_name, $woocommerce_products, DAY_IN_SECONDS );
}
$product_data = json_decode( $woocommerce_products['body'] );
$products = array();
@ -242,4 +250,4 @@ class WC_Admin_Onboarding {
}
}
new WC_Admin_Onboarding();
WC_Admin_Onboarding::get_instance();