Ensure array is returned from wc_get_attribute_taxonomies

This commit is contained in:
Mike Jolley 2015-08-11 17:10:32 +01:00
parent 3bd52a78a5
commit f6f2d7f9df
1 changed files with 2 additions and 4 deletions

View File

@ -25,14 +25,12 @@ function wc_get_text_attributes( $raw_attributes ) {
/** /**
* Get attribute taxonomies. * Get attribute taxonomies.
* *
* @return object * @return array of objects
*/ */
function wc_get_attribute_taxonomies() { function wc_get_attribute_taxonomies() {
$transient_name = 'wc_attribute_taxonomies'; $transient_name = 'wc_attribute_taxonomies';
if ( false === ( $attribute_taxonomies = get_transient( $transient_name ) ) ) { if ( false === ( $attribute_taxonomies = get_transient( $transient_name ) ) ) {
global $wpdb; global $wpdb;
$attribute_taxonomies = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "woocommerce_attribute_taxonomies" ); $attribute_taxonomies = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "woocommerce_attribute_taxonomies" );
@ -40,7 +38,7 @@ function wc_get_attribute_taxonomies() {
set_transient( $transient_name, $attribute_taxonomies ); set_transient( $transient_name, $attribute_taxonomies );
} }
return apply_filters( 'woocommerce_attribute_taxonomies', $attribute_taxonomies ); return (array) array_filter( apply_filters( 'woocommerce_attribute_taxonomies', $attribute_taxonomies ) );
} }
/** /**