From bdd95b2922e5d2599c887ae507ee540ce7060b1d Mon Sep 17 00:00:00 2001 From: Robin Cornett Date: Wed, 26 Jun 2019 13:28:19 -0400 Subject: [PATCH] Move/update block registration --- includes/class-displayfeaturedimagegenesis.php | 11 +---------- .../class-displayfeaturedimagegenesis-widgets.php | 12 ++++++++++++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/includes/class-displayfeaturedimagegenesis.php b/includes/class-displayfeaturedimagegenesis.php index 6e39eb8..44ac943 100644 --- a/includes/class-displayfeaturedimagegenesis.php +++ b/includes/class-displayfeaturedimagegenesis.php @@ -124,8 +124,8 @@ class Display_Featured_Image_Genesis { // Widgets add_action( 'widgets_init', array( $this->widgets, 'register_widgets' ) ); add_action( 'widgets_init', array( $this->widgets, 'register_shortcodes' ) ); + add_action( 'init', array( $this->widgets, 'register_blocks' ) ); add_action( 'admin_enqueue_scripts', array( $this->widgets, 'enqueue_scripts' ) ); - add_action( 'init', array( $this, 'maybe_register_block' ) ); // Taxonomies, Authors add_filter( 'displayfeaturedimagegenesis_get_taxonomies', array( $this->taxonomies, 'remove_post_status_terms' ) ); @@ -250,15 +250,6 @@ class Display_Featured_Image_Genesis { } } - public function maybe_register_block() { - if ( ! function_exists( 'register_block_type' ) ) { - return; - } - include_once 'widgets/class-displayfeaturedimagegenesis-widgets-blocks.php'; - $block = new DisplayFeaturedImageGenesisWidgetsBlocks(); - $block->init(); - } - /** * Add link to plugin settings page in plugin table * @param $links array link to settings page diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets.php index 345bb9a..bc76e2e 100644 --- a/includes/widgets/class-displayfeaturedimagegenesis-widgets.php +++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets.php @@ -47,6 +47,18 @@ class DisplayFeaturedImageGenesisWidgets { add_action( 'sixtenpress_shortcode_modal', array( $editor, 'do_modal' ) ); } + /** + * Register our featured image blocks. + */ + public function register_blocks() { + if ( ! function_exists( 'register_block_type' ) ) { + return; + } + require_once 'class-displayfeaturedimagegenesis-widgets-blocks.php'; + $block = new DisplayFeaturedImageGenesisWidgetsBlocks(); + $block->init(); + } + /** * Enqueue and localize widget scripts. */