Permalink
Browse files

3.4.2 fix salient shit

  • Loading branch information...
thesabeltuto committed Jan 12, 2018
2 parents 2185a65 + 037ecaa commit 14be47a32c5b067cbfd3b76bd0d4cebf631bccfc
Showing with 10 additions and 5 deletions.
  1. +10 −5 includes/integrations/integrations.php
@@ -2,18 +2,23 @@
// general theme settings
include(WM4D_OPTIONS_PLUGIN_DIR.'/includes/integrations/theme-functions.php');
<<<<<<< HEAD
// plugin integration settings
if( wp_get_theme( 'soulmedic' )->exists() ) {
include(WM4D_OPTIONS_PLUGIN_DIR.'/includes/integrations/plugins/layerslider.php');
} else {
add_filter( 'default_hidden_meta_boxes', 'enable_custom_fields_per_default', 20, 1 );
}
=======
// soulmedic theme integration settings
if( wp_get_theme() == 'soulmedic' ) {
include(WM4D_OPTIONS_PLUGIN_DIR.'/includes/integrations/plugins/layerslider.php');
include(WM4D_OPTIONS_PLUGIN_DIR.'/includes/integrations/themes/soulmedic.php');
}
// plugin integration settings
>>>>>>> refs/remotes/origin/master
include(WM4D_OPTIONS_PLUGIN_DIR.'/includes/integrations/plugins/responsive-map.php');
include(WM4D_OPTIONS_PLUGIN_DIR.'/includes/integrations/plugins/gravityforms.php');
// theme integration settings
include(WM4D_OPTIONS_PLUGIN_DIR.'/includes/integrations/themes/soulmedic.php');
?>

0 comments on commit 14be47a

Please sign in to comment.