Fix duplication of class instantiation

dmhendricks · Dec 17, 2018 · 3385b98 · 3385b98
1 parent afa7205
commit 3385b98
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 20 deletions.
diff --git a/app/Core.php b/app/Core.php
@@ -9,7 +9,7 @@ function __construct() {
  add_filter( 'body_class', array( $this, 'add_body_classes' ) );
 
  // Example - Remove Emoji code from header
- if( !$this->is_ajax() && $this->get_carbon_plugin_option( 'remove_header_emojicons' ) ) {
+ if( $this->get_carbon_plugin_option( 'remove_header_emojicons' ) ) {
  add_filter( 'init', array( $this, 'disable_wp_emojicons' ) );
  }
 

diff --git a/app/Plugin.php b/app/Plugin.php
@@ -99,8 +99,6 @@ public function load_dependencies() {
 
  if( class_exists( 'Carbon_Fields\\Carbon_Fields' ) ) {
  add_action( 'after_setup_theme', array( 'Carbon_Fields\\Carbon_Fields', 'boot' ) );
- } else {
- new TGMPA();
  }
 
  add_action( 'carbon_fields_fields_registered', array( $this, 'load_plugin' ));

diff --git a/app/PostTypes/Clients.php b/app/PostTypes/Clients.php
@@ -62,8 +62,10 @@ public function add_post_type_client() {
  Container::make( 'post_meta', 'Contact Info' )
  ->show_on_post_type( $cpt->name )
  ->add_fields( array(
- Field::make( 'text', $this->prefix( 'url' ), __( 'Web Site', self::$textdomain ) ),
- Field::make( 'text', $this->prefix( 'phone' ), __( 'Phone Number', self::$textdomain ) ),
+ Field::make( 'text', $this->prefix( 'url' ), __( 'Web Site', self::$textdomain ) )
+ ->set_classes( 'carbon-fields-custom-field-url' ),
+ Field::make( 'text', $this->prefix( 'phone' ), __( 'Phone Number', self::$textdomain ) )
+ ->set_classes( 'carbon-fields-custom-field-tel' ),
  Field::make( 'textarea', $this->prefix( 'address' ), __( 'Address', self::$textdomain ) )
  ->set_rows( 4 )
  )

diff --git a/app/PostTypes/PostTypes_Loader.php b/app/PostTypes/PostTypes_Loader.php
@@ -16,13 +16,8 @@ public function __construct() {
  Clients::class
  );
 
- foreach( $this->posttypes as $posttypesClass ) {
-
- $posttype = new $posttypesClass();
- if( $posttype instanceof PostTypeInterface ) {
- new $posttype();
- }
-
+ foreach( $this->posttypes as $postTypesClass ) {
+ if( class_exists( $postTypesClass ) ) new $postTypesClass();
  }
 
  }

diff --git a/app/Shortcodes/Shortcode_Loader.php b/app/Shortcodes/Shortcode_Loader.php
@@ -18,14 +18,7 @@ public function __construct() {
  );
 
  foreach( $this->shortcodes as $shortcodeClass ) {
-
- $shortcode = new $shortcodeClass();
- if( $shortcode instanceof ShortcodeInterface ) {
- new $shortcode();
- } else {
- // Log or show error notices
- }
-
+ if( class_exists( $shortcodeClass ) ) new $shortcodeClass();
  }
 
  }