This commit is contained in:
magepeopleteam 2019-06-03 08:24:18 +00:00
parent 29af1aeff5
commit 98bb0ec7de
2 changed files with 21 additions and 6 deletions

View File

@ -324,4 +324,10 @@ A. you can create support ticket here with problem details with possible screens
*Update Release: *Update Release:
==> CSV Blank issue fixed ==> CSV Blank issue fixed
==> Multiple Add Calender feature added. ==> Multiple Add Calender feature added.
21 May 2019* 21 May 2019*
*= 2.6.1 =
*Update Release:
==> Templating issue fixed in child theme
03 June 2019*

View File

@ -3,12 +3,12 @@
* Plugin Name: Woocommerce Events Manager * Plugin Name: Woocommerce Events Manager
* Plugin URI: http://mage-people.com * Plugin URI: http://mage-people.com
* Description: A Complete Event Solution for WordPress by MagePeople.. * Description: A Complete Event Solution for WordPress by MagePeople..
* Version: 2.6.0 * Version: 2.6.1
* Author: MagePeople Team * Author: MagePeople Team
* Author URI: http://www.mage-people.com/ * Author URI: http://www.mage-people.com/
* Text Domain: mage-eventpress * Text Domain: mage-eventpress
* Domain Path: /languages/ * Domain Path: /languages/
*/ */
include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
if ( is_plugin_active( 'woocommerce/woocommerce.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/mep_shortcode.php");
require_once(dirname(__FILE__) . "/inc/admin_setting_panel.php"); require_once(dirname(__FILE__) . "/inc/admin_setting_panel.php");
require_once(dirname(__FILE__) . "/inc/mep_enque.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_csv_export.php");
require_once(dirname(__FILE__) . "/inc/mep_user_custom_style.php"); require_once(dirname(__FILE__) . "/inc/mep_user_custom_style.php");
require_once(dirname(__FILE__) . "/inc/mep_tax_meta.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) { function mep_load_events_templates($template) {
@ -549,6 +556,8 @@ function mep_load_events_templates($template) {
$template_path = 'mage-events/'; $template_path = 'mage-events/';
$default_path = plugin_dir_path( __FILE__ ) . 'templates/'; $default_path = plugin_dir_path( __FILE__ ) . 'templates/';
$template = locate_template( array($template_path . $template_name) ); $template = locate_template( array($template_path . $template_name) );
if ( ! $template ) : if ( ! $template ) :
$template = $default_path . $template_name; $template = $default_path . $template_name;
endif; endif;