Skip to content

Commit 7a2af5e

Browse files
author
Maxime CULEA
committed
refactor mpt loading method to include the mpt dir as we are using the mpt_loading_method
1 parent b927f02 commit 7a2af5e

File tree

2 files changed

+9
-29
lines changed

2 files changed

+9
-29
lines changed

classes/class-shortcode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class MPT_Shortcode {
88
* @return mixed Value.
99
*/
1010
public function __construct() {
11-
_mpt_load_files(MPT_DIR . 'classes/shortcodes/', array('shortcode-registration', 'shortcode-login', 'shortcode-lost-password', 'shortcode-change-password'), 'class-');
11+
_mpt_load_files( 'classes/shortcodes/', array('shortcode-registration', 'shortcode-login', 'shortcode-lost-password', 'shortcode-change-password'), 'class-');
1212

1313
new MPT_Shortcode_Registration();
1414
new MPT_Shortcode_Login();

members-post-type.php

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -89,48 +89,28 @@
8989
// Function for easy load files
9090
function _mpt_load_files( $dir, $files, $prefix = '' ) {
9191
foreach ( $files as $file ) {
92-
if ( is_file( $dir . $prefix . $file . ".php" ) ) {
93-
require_once( $dir . $prefix . $file . ".php" );
92+
if ( is_file( MPT_DIR . $dir . $prefix . $file . ".php" ) ) {
93+
require_once( MPT_DIR . $dir . $prefix . $file . ".php" );
9494
}
9595
}
9696
}
9797

9898
// Plugin functions
99-
_mpt_load_files( MPT_DIR . 'functions/', array( 'api', 'template' ) );
99+
_mpt_load_files( 'functions/', array( 'api', 'template' ) );
100100

101101
// Plugin client classes
102-
_mpt_load_files( MPT_DIR . 'classes/', array(
103-
'main',
104-
'plugin',
105-
'content-permissions',
106-
'post-type',
107-
'private-website',
108-
'security',
109-
'shortcode',
110-
'taxonomy',
111-
'widget'
112-
), 'class-' );
102+
_mpt_load_files( 'classes/', array( 'main', 'plugin', 'content-permissions', 'post-type', 'private-website', 'security', 'shortcode', 'taxonomy', 'widget' ), 'class-' );
113103

114104
// Plugin helper classes
115-
_mpt_load_files( MPT_DIR . 'classes/helpers/', array( 'member-auth', 'member-utility', 'options' ), 'class-' );
105+
_mpt_load_files( 'classes/helpers/', array( 'member-auth', 'member-utility', 'options' ), 'class-' );
116106

117107
// Plugin model classes
118-
_mpt_load_files( MPT_DIR . 'classes/models/', array( 'member', 'roles', 'role' ), 'class-' );
108+
_mpt_load_files( 'classes/models/', array( 'member', 'roles', 'role' ), 'class-' );
119109

120110
// Plugin admin classes
121111
if ( is_admin() ) {
122-
_mpt_load_files( MPT_DIR . 'classes/admin/', array(
123-
'content-permissions',
124-
'export',
125-
'main',
126-
'post-type',
127-
'taxonomy',
128-
'import',
129-
'settings-main',
130-
'users-to-members',
131-
'welcome-message'
132-
), 'class-' );
133-
112+
_mpt_load_files( MPT_DIR . 'classes/admin/', array( 'content-permissions', 'export', 'main', 'post-type', 'taxonomy', 'import', 'settings-main', 'users-to-members', 'welcome-message' ), 'class-' );
113+
134114
// Load class for API settings
135115
if ( ! class_exists( 'WeDevs_Settings_API' ) ) {
136116
require_once( MPT_DIR . 'libraries/wordpress-settings-api-class/class.settings-api.php' );

0 commit comments

Comments
 (0)