diff --git a/readme.txt b/readme.txt index d39f4b5..e0de5d1 100644 --- a/readme.txt +++ b/readme.txt @@ -324,4 +324,10 @@ A. you can create support ticket here with problem details with possible screens *Update Release: ==> CSV Blank issue fixed ==> Multiple Add Calender feature added. -21 May 2019* \ No newline at end of file +21 May 2019* + + +*= 2.6.1 = +*Update Release: +==> Templating issue fixed in child theme +03 June 2019* \ No newline at end of file diff --git a/woocommerce-event-press.php b/woocommerce-event-press.php index 809051a..6e7b007 100644 --- a/woocommerce-event-press.php +++ b/woocommerce-event-press.php @@ -3,12 +3,12 @@ * Plugin Name: Woocommerce Events Manager * Plugin URI: http://mage-people.com * Description: A Complete Event Solution for WordPress by MagePeople.. -* Version: 2.6.0 +* Version: 2.6.1 * Author: MagePeople Team * Author URI: http://www.mage-people.com/ * Text Domain: mage-eventpress * Domain Path: /languages/ -*/ +*/ include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); if ( is_plugin_active( 'woocommerce/woocommerce.php' ) ) { @@ -22,8 +22,6 @@ require_once(dirname(__FILE__) . "/inc/mep_extra_price.php"); require_once(dirname(__FILE__) . "/inc/mep_shortcode.php"); require_once(dirname(__FILE__) . "/inc/admin_setting_panel.php"); require_once(dirname(__FILE__) . "/inc/mep_enque.php"); -require_once(dirname(__FILE__) . "/templates/template-prts/templating.php"); -// require_once(dirname(__FILE__) . "/lib/PHPExcel.php"); require_once(dirname(__FILE__) . "/inc/mep_csv_export.php"); require_once(dirname(__FILE__) . "/inc/mep_user_custom_style.php"); require_once(dirname(__FILE__) . "/inc/mep_tax_meta.php"); @@ -539,7 +537,16 @@ function mep_event_redirect_to_checkout() { } } - +add_action('init','mep_include_template_parts'); +function mep_include_template_parts(){ + $template_name = 'templating.php'; + $template_path = get_stylesheet_directory().'/mage-events/template-prts/'; + if(file_exists($template_path . $template_name)) { + require_once(get_stylesheet_directory() . "/mage-events/template-prts/templating.php"); + }else{ + require_once(dirname(__FILE__) . "/templates/template-prts/templating.php"); + } +} function mep_load_events_templates($template) { @@ -549,6 +556,8 @@ function mep_load_events_templates($template) { $template_path = 'mage-events/'; $default_path = plugin_dir_path( __FILE__ ) . 'templates/'; $template = locate_template( array($template_path . $template_name) ); + + if ( ! $template ) : $template = $default_path . $template_name; endif;