diff --git a/display-featured-image-genesis.php b/display-featured-image-genesis.php index 6117da0..e57934f 100644 --- a/display-featured-image-genesis.php +++ b/display-featured-image-genesis.php @@ -32,6 +32,7 @@ if ( ! defined( 'DISPLAYFEATUREDIMAGEGENESIS_BASENAME' ) ) { function display_featured_image_genesis_require() { $files = array( 'class-displayfeaturedimagegenesis', + 'class-displayfeaturedimagegenesis-getsetting', 'class-displayfeaturedimagegenesis-helper', 'class-displayfeaturedimagegenesis-admin', 'class-displayfeaturedimagegenesis-author', diff --git a/includes/class-displayfeaturedimagegenesis-customizer.php b/includes/class-displayfeaturedimagegenesis-customizer.php index 129d888..3c75477 100644 --- a/includes/class-displayfeaturedimagegenesis-customizer.php +++ b/includes/class-displayfeaturedimagegenesis-customizer.php @@ -33,8 +33,7 @@ class Display_Featured_Image_Genesis_Customizer extends Display_Featured_Image_G */ public function customizer( $wp_customize ) { - $this->settings = new Display_Featured_Image_Genesis_Settings(); - $this->defaults = $this->settings->defaults(); + $this->defaults = $this->defaults(); $setting = get_option( 'displayfeaturedimagegenesis', false ); if ( ! $setting ) { add_option( 'displayfeaturedimagegenesis', $this->defaults ); diff --git a/includes/class-displayfeaturedimagegenesis-getsetting.php b/includes/class-displayfeaturedimagegenesis-getsetting.php new file mode 100644 index 0000000..36ec355 --- /dev/null +++ b/includes/class-displayfeaturedimagegenesis-getsetting.php @@ -0,0 +1,41 @@ + 0, + 'default' => '', + 'exclude_front' => 0, + 'keep_titles' => 0, + 'move_excerpts' => 0, + 'is_paged' => 0, + 'feed_image' => 0, + 'thumbnails' => 0, + 'post_types' => array(), + 'skip' => array(), + 'fallback' => array(), + 'max_height' => '', + 'always_default' => 0, + ) ); + } + + /** + * Retrieve plugin setting. + * @return array All plugin settings. + * + * @since 2.3.0 + */ + public function get_display_setting() { + $defaults = $this->defaults(); + $setting = get_option( 'displayfeaturedimagegenesis', $defaults ); + return wp_parse_args( $setting, $defaults ); + + } +} diff --git a/includes/class-displayfeaturedimagegenesis-helper.php b/includes/class-displayfeaturedimagegenesis-helper.php index 3244baa..428cad4 100644 --- a/includes/class-displayfeaturedimagegenesis-helper.php +++ b/includes/class-displayfeaturedimagegenesis-helper.php @@ -7,7 +7,7 @@ * @copyright 2014-2016 Robin Cornett Creative, LLC */ -class Display_Featured_Image_Genesis_Helper { +class Display_Featured_Image_Genesis_Helper extends DisplayFeaturedImageGenesisGetSetting { protected $setting; diff --git a/includes/class-displayfeaturedimagegenesis-settings.php b/includes/class-displayfeaturedimagegenesis-settings.php index 157f93e..5604b14 100644 --- a/includes/class-displayfeaturedimagegenesis-settings.php +++ b/includes/class-displayfeaturedimagegenesis-settings.php @@ -119,7 +119,7 @@ class Display_Featured_Image_Genesis_Settings extends Display_Featured_Image_Gen /** * Settings for options screen - * @return settings for backstretch image options + * @return array settings for backstretch image options * * @since 1.1.0 */ @@ -127,37 +127,6 @@ class Display_Featured_Image_Genesis_Settings extends Display_Featured_Image_Gen register_setting( 'displayfeaturedimagegenesis', 'displayfeaturedimagegenesis', array( $this, 'do_validation_things' ) ); } - public function defaults() { - return apply_filters( 'displayfeaturedimagegenesis_defaults', array( - 'less_header' => 0, - 'default' => '', - 'exclude_front' => 0, - 'keep_titles' => 0, - 'move_excerpts' => 0, - 'is_paged' => 0, - 'feed_image' => 0, - 'thumbnails' => 0, - 'post_types' => array(), - 'skip' => array(), - 'fallback' => array(), - 'max_height' => '', - 'always_default' => 0, - ) ); - } - - /** - * Retrieve plugin setting. - * @return array All plugin settings. - * - * @since 2.3.0 - */ - public function get_display_setting() { - $defaults = $this->defaults(); - $setting = get_option( 'displayfeaturedimagegenesis', $defaults ); - return wp_parse_args( $setting, $defaults ); - - } - /** * Register plugin settings page sections *