10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix includes/core/class-shortcodes.php merge conflicts

Browse Source
This commit is contained in:
Champ Camba
2018-01-15 19:33:44 +08:00
parent 55eefda64d
commit e60d094ee6
1 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-shortcodes.php
+3 -30
View File
@@ -138,7 +138,7 @@ if ( ! class_exists( 'Shortcodes' ) ) {
return $form_id;
}
<<<<<<< HEAD
/***
*** @load a compatible template
*/
@@ -149,7 +149,7 @@ if ( ! class_exists( 'Shortcodes' ) ) {
$args = $this->set_args;
unset( $args['file'] );
unset( $args['theme-file'] );
unset( $args['theme_file'] );
extract( $args );
}
@@ -157,42 +157,15 @@ if ( ! class_exists( 'Shortcodes' ) ) {
$file = um_path . "templates/{$tpl}.php";
$theme_file = get_stylesheet_directory() . "/ultimate-member/templates/{$tpl}.php";
=======
/**
* load a compatible template
*
* @param $tpl
*/
function load_template( $tpl ) {
$file = um_path . 'templates/' . $tpl . '.php';
$theme_file = get_stylesheet_directory() . '/ultimate-member/templates/' . $tpl . '.php';
>>>>>>> origin/master
if ( file_exists( $theme_file ) ) {
$file = $theme_file;
}
if ( file_exists( $file ) ) {
<<<<<<< HEAD
include $file;
}
=======
$loop = ( $this->loop ) ? $this->loop : array();
>>>>>>> origin/master
if ( isset( $this->set_args ) && is_array( $this->set_args ) ) {
$args = $this->set_args;
/**
* @var $tpl
*/
extract( $args );
}
include $file;
}
}