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

Fix how classic groups/settings are registered so that they are always avaiable when calling filters.

This commit is contained in:
Justin Shreve 2016-03-28 13:51:17 -07:00
parent 9f7c769c4f
commit 8c211b87ef
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
includes/api/wc-rest-settings-controller.php
View File

@ -537,6 +537,7 @@ class WC_Rest_Settings_Controller extends WP_Rest_Controller {
return in_array( $type, array(
'text', 'email', 'number', 'color', 'password',
'textarea', 'select', 'multiselect', 'radio', 'checkbox',
'multi_select_countries', 'image_width',
) );
}
@ -563,7 +564,7 @@ class WC_Rest_Settings_Controller extends WP_Rest_Controller {
protected function setting_defaults() {
return array(
'id' => null,
'label' => null,
'label' => '',
'type' => null,
'description' => '',
'tip' => '',

40
includes/class-wc-register-classic-settings.php
View File

@ -23,7 +23,22 @@ class WC_Register_Classic_Settings {
*/
public function __construct( $page ) {
$this->page = $page;
add_filter( 'woocommerce_settings-' . $this->page->get_id() . '', array( $this, 'register_classic_settings' ) );
add_filter( 'woocommerce_settings_groups', array( $this, 'register_classic_group' ) );
add_filter( 'woocommerce_settings-' . $this->page->get_id(), array( $this, 'register_classic_settings' ) );
}
/**
* Registers a setting group.
* @since 2.7.0
* @param array $group
* @return array
*/
public function register_classic_group( $groups ) {
$groups[] = array(
'id' => $this->page->get_id(),
'label' => $this->page->get_label(),
);
return $groups;
}
/**
@ -68,21 +83,14 @@ class WC_Register_Classic_Settings {
}
/**
* Register full settings sections to a single group.
* Register full classic settings to the REST API.
* @since 2.7.0
* @param array $groups Existing registered groups.
* @return array
*/
function wc_settings_api_register_classic_groups( $groups ) {
$pages = WC_Admin_Settings::get_settings_pages();
foreach ( $pages as $page ) {
$groups[] = array(
'id' => $page->get_id(),
'label' => $page->get_label(),
);
new WC_Register_Classic_Settings( $page );
}
return $groups;
}
function wc_settings_api_register_classic() {
$pages = WC_Admin_Settings::get_settings_pages();
foreach ( $pages as $page ) {
new WC_Register_Classic_Settings( $page );
}
}
add_action( 'woocommerce_settings_groups', 'wc_settings_api_register_classic_groups' );
add_action( 'rest_api_init', 'wc_settings_api_register_classic' );