@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('No direct script access allowed'); |
5 | 5 | /** |
6 | 6 | * Event Espresso |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * ------------------------------------------------------------------------ |
26 | 26 | */ |
27 | 27 | ?> |
28 | -<strong style="color:#F00"><?php esc_html_e('Please Note:','event_espresso')?></strong> <?php esc_html_e("You will need a PayPal Premier or Business account for the PayPal IPN to work correctly.", 'event_espresso'); |
|
28 | +<strong style="color:#F00"><?php esc_html_e('Please Note:', 'event_espresso')?></strong> <?php esc_html_e("You will need a PayPal Premier or Business account for the PayPal IPN to work correctly.", 'event_espresso'); |
|
29 | 29 | |
30 | 30 | |
31 | 31 | // End of file paypal_standard_settings_before_form.template.php |
32 | 32 | \ No newline at end of file |
@@ -1,5 +1,5 @@ discard block |
||
1 | -<?php if ( ! defined( 'ABSPATH' ) ) { |
|
2 | - exit( 'No direct script access allowed' ); |
|
1 | +<?php if ( ! defined('ABSPATH')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | 3 | } |
4 | 4 | /* |
5 | 5 | Plugin Name: Event Espresso |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * |
42 | 42 | */ |
43 | 43 | |
44 | -if ( function_exists( 'espresso_version' ) ) { |
|
44 | +if (function_exists('espresso_version')) { |
|
45 | 45 | |
46 | 46 | /** |
47 | 47 | * espresso_duplicate_plugin_error |
@@ -50,12 +50,12 @@ discard block |
||
50 | 50 | function espresso_duplicate_plugin_error() { |
51 | 51 | ?> |
52 | 52 | <div class="error"> |
53 | - <p><?php _e( 'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.', 'event_espresso' ); ?></p> |
|
53 | + <p><?php _e('Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.', 'event_espresso'); ?></p> |
|
54 | 54 | </div> |
55 | 55 | <?php |
56 | - espresso_deactivate_plugin( plugin_basename( __FILE__ ) ); |
|
56 | + espresso_deactivate_plugin(plugin_basename(__FILE__)); |
|
57 | 57 | } |
58 | - add_action( 'admin_notices', 'espresso_duplicate_plugin_error', 1 ); |
|
58 | + add_action('admin_notices', 'espresso_duplicate_plugin_error', 1); |
|
59 | 59 | |
60 | 60 | } else { |
61 | 61 | |
@@ -66,103 +66,103 @@ discard block |
||
66 | 66 | * @return string |
67 | 67 | */ |
68 | 68 | function espresso_version() { |
69 | - return apply_filters( 'FHEE__espresso__espresso_version', '4.9.5.rc.007' ); |
|
69 | + return apply_filters('FHEE__espresso__espresso_version', '4.9.5.rc.007'); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | // define versions |
73 | - define( 'EVENT_ESPRESSO_VERSION', espresso_version() ); |
|
74 | - define( 'EE_MIN_WP_VER_REQUIRED', '4.1' ); |
|
75 | - define( 'EE_MIN_WP_VER_RECOMMENDED', '4.4.2' ); |
|
76 | - define( 'EE_MIN_PHP_VER_REQUIRED', '5.3.0' ); |
|
77 | - define( 'EE_MIN_PHP_VER_RECOMMENDED', '5.4.44' ); |
|
78 | - define( 'EVENT_ESPRESSO_POWERED_BY', 'Event Espresso - ' . EVENT_ESPRESSO_VERSION ); |
|
79 | - define( 'EVENT_ESPRESSO_MAIN_FILE', __FILE__ ); |
|
73 | + define('EVENT_ESPRESSO_VERSION', espresso_version()); |
|
74 | + define('EE_MIN_WP_VER_REQUIRED', '4.1'); |
|
75 | + define('EE_MIN_WP_VER_RECOMMENDED', '4.4.2'); |
|
76 | + define('EE_MIN_PHP_VER_REQUIRED', '5.3.0'); |
|
77 | + define('EE_MIN_PHP_VER_RECOMMENDED', '5.4.44'); |
|
78 | + define('EVENT_ESPRESSO_POWERED_BY', 'Event Espresso - '.EVENT_ESPRESSO_VERSION); |
|
79 | + define('EVENT_ESPRESSO_MAIN_FILE', __FILE__); |
|
80 | 80 | //used to be DIRECTORY_SEPARATOR, but that caused issues on windows |
81 | - if ( ! defined( 'DS' ) ) { |
|
82 | - define( 'DS', '/' ); |
|
81 | + if ( ! defined('DS')) { |
|
82 | + define('DS', '/'); |
|
83 | 83 | } |
84 | - if ( ! defined( 'PS' ) ) { |
|
85 | - define( 'PS', PATH_SEPARATOR ); |
|
84 | + if ( ! defined('PS')) { |
|
85 | + define('PS', PATH_SEPARATOR); |
|
86 | 86 | } |
87 | - if ( ! defined( 'SP' ) ) { |
|
88 | - define( 'SP', ' ' ); |
|
87 | + if ( ! defined('SP')) { |
|
88 | + define('SP', ' '); |
|
89 | 89 | } |
90 | - if ( ! defined( 'EENL' ) ) { |
|
91 | - define( 'EENL', "\n" ); |
|
90 | + if ( ! defined('EENL')) { |
|
91 | + define('EENL', "\n"); |
|
92 | 92 | } |
93 | - define( 'EE_SUPPORT_EMAIL', '[email protected]' ); |
|
93 | + define('EE_SUPPORT_EMAIL', '[email protected]'); |
|
94 | 94 | // define the plugin directory and URL |
95 | - define( 'EE_PLUGIN_BASENAME', plugin_basename( EVENT_ESPRESSO_MAIN_FILE ) ); |
|
96 | - define( 'EE_PLUGIN_DIR_PATH', plugin_dir_path( EVENT_ESPRESSO_MAIN_FILE ) ); |
|
97 | - define( 'EE_PLUGIN_DIR_URL', plugin_dir_url( EVENT_ESPRESSO_MAIN_FILE ) ); |
|
95 | + define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE)); |
|
96 | + define('EE_PLUGIN_DIR_PATH', plugin_dir_path(EVENT_ESPRESSO_MAIN_FILE)); |
|
97 | + define('EE_PLUGIN_DIR_URL', plugin_dir_url(EVENT_ESPRESSO_MAIN_FILE)); |
|
98 | 98 | // main root folder paths |
99 | - define( 'EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH . 'admin_pages' . DS ); |
|
100 | - define( 'EE_CORE', EE_PLUGIN_DIR_PATH . 'core' . DS ); |
|
101 | - define( 'EE_MODULES', EE_PLUGIN_DIR_PATH . 'modules' . DS ); |
|
102 | - define( 'EE_PUBLIC', EE_PLUGIN_DIR_PATH . 'public' . DS ); |
|
103 | - define( 'EE_SHORTCODES', EE_PLUGIN_DIR_PATH . 'shortcodes' . DS ); |
|
104 | - define( 'EE_WIDGETS', EE_PLUGIN_DIR_PATH . 'widgets' . DS ); |
|
105 | - define( 'EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH . 'payment_methods' . DS ); |
|
106 | - define( 'EE_CAFF_PATH', EE_PLUGIN_DIR_PATH . 'caffeinated' . DS ); |
|
99 | + define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH.'admin_pages'.DS); |
|
100 | + define('EE_CORE', EE_PLUGIN_DIR_PATH.'core'.DS); |
|
101 | + define('EE_MODULES', EE_PLUGIN_DIR_PATH.'modules'.DS); |
|
102 | + define('EE_PUBLIC', EE_PLUGIN_DIR_PATH.'public'.DS); |
|
103 | + define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH.'shortcodes'.DS); |
|
104 | + define('EE_WIDGETS', EE_PLUGIN_DIR_PATH.'widgets'.DS); |
|
105 | + define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH.'payment_methods'.DS); |
|
106 | + define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH.'caffeinated'.DS); |
|
107 | 107 | // core system paths |
108 | - define( 'EE_ADMIN', EE_CORE . 'admin' . DS ); |
|
109 | - define( 'EE_CPTS', EE_CORE . 'CPTs' . DS ); |
|
110 | - define( 'EE_CLASSES', EE_CORE . 'db_classes' . DS ); |
|
111 | - define( 'EE_INTERFACES', EE_CORE . 'interfaces' . DS ); |
|
112 | - define( 'EE_BUSINESS', EE_CORE . 'business' . DS ); |
|
113 | - define( 'EE_MODELS', EE_CORE . 'db_models' . DS ); |
|
114 | - define( 'EE_HELPERS', EE_CORE . 'helpers' . DS ); |
|
115 | - define( 'EE_LIBRARIES', EE_CORE . 'libraries' . DS ); |
|
116 | - define( 'EE_TEMPLATES', EE_CORE . 'templates' . DS ); |
|
117 | - define( 'EE_THIRD_PARTY', EE_CORE . 'third_party_libs' . DS ); |
|
118 | - define( 'EE_GLOBAL_ASSETS', EE_TEMPLATES . 'global_assets' . DS ); |
|
119 | - define( 'EE_FORM_SECTIONS', EE_LIBRARIES . 'form_sections' . DS ); |
|
108 | + define('EE_ADMIN', EE_CORE.'admin'.DS); |
|
109 | + define('EE_CPTS', EE_CORE.'CPTs'.DS); |
|
110 | + define('EE_CLASSES', EE_CORE.'db_classes'.DS); |
|
111 | + define('EE_INTERFACES', EE_CORE.'interfaces'.DS); |
|
112 | + define('EE_BUSINESS', EE_CORE.'business'.DS); |
|
113 | + define('EE_MODELS', EE_CORE.'db_models'.DS); |
|
114 | + define('EE_HELPERS', EE_CORE.'helpers'.DS); |
|
115 | + define('EE_LIBRARIES', EE_CORE.'libraries'.DS); |
|
116 | + define('EE_TEMPLATES', EE_CORE.'templates'.DS); |
|
117 | + define('EE_THIRD_PARTY', EE_CORE.'third_party_libs'.DS); |
|
118 | + define('EE_GLOBAL_ASSETS', EE_TEMPLATES.'global_assets'.DS); |
|
119 | + define('EE_FORM_SECTIONS', EE_LIBRARIES.'form_sections'.DS); |
|
120 | 120 | // gateways |
121 | - define( 'EE_GATEWAYS', EE_MODULES . 'gateways' . DS ); |
|
122 | - define( 'EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL . 'modules' . DS . 'gateways' . DS ); |
|
121 | + define('EE_GATEWAYS', EE_MODULES.'gateways'.DS); |
|
122 | + define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL.'modules'.DS.'gateways'.DS); |
|
123 | 123 | // asset URL paths |
124 | - define( 'EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'templates' . DS ); |
|
125 | - define( 'EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL . 'global_assets' . DS ); |
|
126 | - define( 'EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL . 'images' . DS ); |
|
127 | - define( 'EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'third_party_libs' . DS ); |
|
128 | - define( 'EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL . 'core/helpers/assets/' ); |
|
129 | - define( 'EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL . 'core/libraries/' ); |
|
124 | + define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL.'core'.DS.'templates'.DS); |
|
125 | + define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL.'global_assets'.DS); |
|
126 | + define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL.'images'.DS); |
|
127 | + define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL.'core'.DS.'third_party_libs'.DS); |
|
128 | + define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL.'core/helpers/assets/'); |
|
129 | + define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL.'core/libraries/'); |
|
130 | 130 | // define upload paths |
131 | 131 | $uploads = wp_upload_dir(); |
132 | 132 | // define the uploads directory and URL |
133 | - define( 'EVENT_ESPRESSO_UPLOAD_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS ); |
|
134 | - define( 'EVENT_ESPRESSO_UPLOAD_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS ); |
|
133 | + define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'].DS.'espresso'.DS); |
|
134 | + define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'].DS.'espresso'.DS); |
|
135 | 135 | // define the templates directory and URL |
136 | - define( 'EVENT_ESPRESSO_TEMPLATE_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS . 'templates' . DS ); |
|
137 | - define( 'EVENT_ESPRESSO_TEMPLATE_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS . 'templates' . DS ); |
|
136 | + define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'].DS.'espresso'.DS.'templates'.DS); |
|
137 | + define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'].DS.'espresso'.DS.'templates'.DS); |
|
138 | 138 | // define the gateway directory and URL |
139 | - define( 'EVENT_ESPRESSO_GATEWAY_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS . 'gateways' . DS ); |
|
140 | - define( 'EVENT_ESPRESSO_GATEWAY_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS . 'gateways' . DS ); |
|
139 | + define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'].DS.'espresso'.DS.'gateways'.DS); |
|
140 | + define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'].DS.'espresso'.DS.'gateways'.DS); |
|
141 | 141 | // languages folder/path |
142 | - define( 'EE_LANGUAGES_SAFE_LOC', '..' . DS . 'uploads' . DS . 'espresso' . DS . 'languages' . DS ); |
|
143 | - define( 'EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'languages' . DS ); |
|
142 | + define('EE_LANGUAGES_SAFE_LOC', '..'.DS.'uploads'.DS.'espresso'.DS.'languages'.DS); |
|
143 | + define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'languages'.DS); |
|
144 | 144 | //check for dompdf fonts in uploads |
145 | - if ( file_exists( EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS ) ) { |
|
146 | - define( 'DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS ); |
|
145 | + if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS)) { |
|
146 | + define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS); |
|
147 | 147 | } |
148 | 148 | //ajax constants |
149 | - define( 'EE_FRONT_AJAX', isset( $_REQUEST[ 'ee_front_ajax' ] ) || isset( $_REQUEST[ 'data' ][ 'ee_front_ajax' ] ) ? true : false ); |
|
150 | - define( 'EE_ADMIN_AJAX', isset( $_REQUEST[ 'ee_admin_ajax' ] ) || isset( $_REQUEST[ 'data' ][ 'ee_admin_ajax' ] ) ? true : false ); |
|
149 | + define('EE_FRONT_AJAX', isset($_REQUEST['ee_front_ajax']) || isset($_REQUEST['data']['ee_front_ajax']) ? true : false); |
|
150 | + define('EE_ADMIN_AJAX', isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax']) ? true : false); |
|
151 | 151 | //just a handy constant occasionally needed for finding values representing infinity in the DB |
152 | 152 | //you're better to use this than its straight value (currently -1) in case you ever |
153 | 153 | //want to change its default value! or find when -1 means infinity |
154 | - define( 'EE_INF_IN_DB', -1 ); |
|
155 | - define( 'EE_INF', INF > (float)PHP_INT_MAX ? INF : PHP_INT_MAX ); |
|
156 | - define( 'EE_DEBUG', false ); |
|
154 | + define('EE_INF_IN_DB', -1); |
|
155 | + define('EE_INF', INF > (float) PHP_INT_MAX ? INF : PHP_INT_MAX); |
|
156 | + define('EE_DEBUG', false); |
|
157 | 157 | |
158 | 158 | /** |
159 | 159 | * espresso_plugin_activation |
160 | 160 | * adds a wp-option to indicate that EE has been activated via the WP admin plugins page |
161 | 161 | */ |
162 | 162 | function espresso_plugin_activation() { |
163 | - update_option( 'ee_espresso_activation', true ); |
|
163 | + update_option('ee_espresso_activation', true); |
|
164 | 164 | } |
165 | - register_activation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation' ); |
|
165 | + register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation'); |
|
166 | 166 | |
167 | 167 | |
168 | 168 | |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | // } |
177 | 177 | // |
178 | 178 | } |
179 | - register_deactivation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation' ); |
|
179 | + register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation'); |
|
180 | 180 | |
181 | 181 | |
182 | 182 | |
@@ -186,15 +186,15 @@ discard block |
||
186 | 186 | */ |
187 | 187 | function espresso_load_error_handling() { |
188 | 188 | // load debugging tools |
189 | - if ( WP_DEBUG === true && is_readable( EE_HELPERS . 'EEH_Debug_Tools.helper.php' ) ) { |
|
190 | - require_once( EE_HELPERS . 'EEH_Debug_Tools.helper.php' ); |
|
189 | + if (WP_DEBUG === true && is_readable(EE_HELPERS.'EEH_Debug_Tools.helper.php')) { |
|
190 | + require_once(EE_HELPERS.'EEH_Debug_Tools.helper.php'); |
|
191 | 191 | EEH_Debug_Tools::instance(); |
192 | 192 | } |
193 | 193 | // load error handling |
194 | - if ( is_readable( EE_CORE . 'EE_Error.core.php' ) ) { |
|
195 | - require_once( EE_CORE . 'EE_Error.core.php' ); |
|
194 | + if (is_readable(EE_CORE.'EE_Error.core.php')) { |
|
195 | + require_once(EE_CORE.'EE_Error.core.php'); |
|
196 | 196 | } else { |
197 | - wp_die( __( 'The EE_Error core class could not be loaded.', 'event_espresso' ) ); |
|
197 | + wp_die(__('The EE_Error core class could not be loaded.', 'event_espresso')); |
|
198 | 198 | } |
199 | 199 | } |
200 | 200 | |
@@ -208,25 +208,25 @@ discard block |
||
208 | 208 | * @param string $full_path_to_file |
209 | 209 | * @throws EE_Error |
210 | 210 | */ |
211 | - function espresso_load_required( $classname, $full_path_to_file ) { |
|
211 | + function espresso_load_required($classname, $full_path_to_file) { |
|
212 | 212 | static $error_handling_loaded = false; |
213 | - if ( ! $error_handling_loaded ) { |
|
213 | + if ( ! $error_handling_loaded) { |
|
214 | 214 | espresso_load_error_handling(); |
215 | 215 | $error_handling_loaded = true; |
216 | 216 | } |
217 | - if ( is_readable( $full_path_to_file ) ) { |
|
218 | - require_once( $full_path_to_file ); |
|
217 | + if (is_readable($full_path_to_file)) { |
|
218 | + require_once($full_path_to_file); |
|
219 | 219 | } else { |
220 | - throw new EE_Error ( sprintf( |
|
221 | - __( 'The %s class file could not be located or is not readable due to file permissions.', 'event_espresso' ), |
|
220 | + throw new EE_Error(sprintf( |
|
221 | + __('The %s class file could not be located or is not readable due to file permissions.', 'event_espresso'), |
|
222 | 222 | $classname |
223 | - ) ); |
|
223 | + )); |
|
224 | 224 | } |
225 | 225 | } |
226 | 226 | |
227 | - espresso_load_required( 'EEH_Base', EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php' ); |
|
228 | - espresso_load_required( 'EEH_File', EE_CORE . 'helpers' . DS . 'EEH_File.helper.php' ); |
|
229 | - espresso_load_required( 'EE_Bootstrap', EE_CORE . 'EE_Bootstrap.core.php' ); |
|
227 | + espresso_load_required('EEH_Base', EE_CORE.'helpers'.DS.'EEH_Base.helper.php'); |
|
228 | + espresso_load_required('EEH_File', EE_CORE.'helpers'.DS.'EEH_File.helper.php'); |
|
229 | + espresso_load_required('EE_Bootstrap', EE_CORE.'EE_Bootstrap.core.php'); |
|
230 | 230 | new EE_Bootstrap(); |
231 | 231 | |
232 | 232 | |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | |
236 | 236 | |
237 | 237 | |
238 | -if ( ! function_exists( 'espresso_deactivate_plugin' ) ) { |
|
238 | +if ( ! function_exists('espresso_deactivate_plugin')) { |
|
239 | 239 | /** |
240 | 240 | * deactivate_plugin |
241 | 241 | * usage: espresso_deactivate_plugin( plugin_basename( __FILE__ )); |
@@ -244,12 +244,12 @@ discard block |
||
244 | 244 | * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file |
245 | 245 | * @return void |
246 | 246 | */ |
247 | - function espresso_deactivate_plugin( $plugin_basename = '' ) { |
|
248 | - if ( ! function_exists( 'deactivate_plugins' ) ) { |
|
249 | - require_once( ABSPATH . 'wp-admin/includes/plugin.php' ); |
|
247 | + function espresso_deactivate_plugin($plugin_basename = '') { |
|
248 | + if ( ! function_exists('deactivate_plugins')) { |
|
249 | + require_once(ABSPATH.'wp-admin/includes/plugin.php'); |
|
250 | 250 | } |
251 | - unset( $_GET[ 'activate' ] ); |
|
252 | - unset( $_REQUEST[ 'activate' ] ); |
|
253 | - deactivate_plugins( $plugin_basename ); |
|
251 | + unset($_GET['activate']); |
|
252 | + unset($_REQUEST['activate']); |
|
253 | + deactivate_plugins($plugin_basename); |
|
254 | 254 | } |
255 | 255 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
3 | 3 | exit('NO direct script access allowed'); |
4 | 4 | |
5 | 5 | |
@@ -31,8 +31,8 @@ discard block |
||
31 | 31 | * ------------------------------------------------------------------------ |
32 | 32 | */ |
33 | 33 | |
34 | -if ( ! class_exists( 'WP_List_Table' )) { |
|
35 | - require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' ); |
|
34 | +if ( ! class_exists('WP_List_Table')) { |
|
35 | + require_once(ABSPATH.'wp-admin/includes/class-wp-list-table.php'); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | abstract class EE_Admin_List_Table extends WP_List_Table { |
@@ -244,16 +244,16 @@ discard block |
||
244 | 244 | * constructor |
245 | 245 | * @param EE_Admin_Page $admin_page we use this for obtaining everything we need in the list table. |
246 | 246 | */ |
247 | - public function __construct( EE_Admin_Page $admin_page ) { |
|
247 | + public function __construct(EE_Admin_Page $admin_page) { |
|
248 | 248 | $this->_admin_page = $admin_page; |
249 | 249 | $this->_req_data = $this->_admin_page->get_request_data(); |
250 | 250 | $this->_view = $this->_admin_page->get_view(); |
251 | - $this->_views = empty( $this->_views ) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views; |
|
251 | + $this->_views = empty($this->_views) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views; |
|
252 | 252 | $this->_current_page = $this->get_pagenum(); |
253 | - $this->_screen = $this->_admin_page->get_current_page() . '_' . $this->_admin_page->get_current_view(); |
|
254 | - $this->_yes_no = array( __('No', 'event_espresso'), __('Yes', 'event_espresso')); |
|
253 | + $this->_screen = $this->_admin_page->get_current_page().'_'.$this->_admin_page->get_current_view(); |
|
254 | + $this->_yes_no = array(__('No', 'event_espresso'), __('Yes', 'event_espresso')); |
|
255 | 255 | |
256 | - $this->_per_page = $this->get_items_per_page( $this->_screen . '_per_page', 10 ); |
|
256 | + $this->_per_page = $this->get_items_per_page($this->_screen.'_per_page', 10); |
|
257 | 257 | |
258 | 258 | $this->_setup_data(); |
259 | 259 | $this->_add_view_counts(); |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | $this->_set_properties(); |
264 | 264 | |
265 | 265 | //set primary column |
266 | - add_filter( 'list_table_primary_column', array( $this, 'set_primary_column' ) ); |
|
266 | + add_filter('list_table_primary_column', array($this, 'set_primary_column')); |
|
267 | 267 | |
268 | 268 | //set parent defaults |
269 | 269 | parent::__construct($this->_wp_list_args); |
@@ -339,17 +339,17 @@ discard block |
||
339 | 339 | * @return string |
340 | 340 | */ |
341 | 341 | protected function _get_hidden_fields() { |
342 | - $action = isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : ''; |
|
343 | - $action = empty( $action ) && isset( $this->_req_data['action'] ) ? $this->_req_data['action'] : $action; |
|
342 | + $action = isset($this->_req_data['route']) ? $this->_req_data['route'] : ''; |
|
343 | + $action = empty($action) && isset($this->_req_data['action']) ? $this->_req_data['action'] : $action; |
|
344 | 344 | //if action is STILL empty, then we set it to default |
345 | - $action = empty( $action ) ? 'default' : $action; |
|
346 | - $field = '<input type="hidden" name="page" value="' . $this->_req_data['page'] . '" />' . "\n"; |
|
347 | - $field .= '<input type="hidden" name="route" value="'. $action .'" />' . "\n";/**/ |
|
348 | - $field .= '<input type="hidden" name="perpage" value="' . $this->_per_page . '" />' . "\n"; |
|
345 | + $action = empty($action) ? 'default' : $action; |
|
346 | + $field = '<input type="hidden" name="page" value="'.$this->_req_data['page'].'" />'."\n"; |
|
347 | + $field .= '<input type="hidden" name="route" value="'.$action.'" />'."\n"; /**/ |
|
348 | + $field .= '<input type="hidden" name="perpage" value="'.$this->_per_page.'" />'."\n"; |
|
349 | 349 | |
350 | 350 | $bulk_actions = $this->_get_bulk_actions(); |
351 | - foreach ( $bulk_actions as $bulk_action => $label ) { |
|
352 | - $field .= '<input type="hidden" name="' . $bulk_action . '_nonce" value="' . wp_create_nonce ( $bulk_action . '_nonce' ) . '" />' . "\n"; |
|
351 | + foreach ($bulk_actions as $bulk_action => $label) { |
|
352 | + $field .= '<input type="hidden" name="'.$bulk_action.'_nonce" value="'.wp_create_nonce($bulk_action.'_nonce').'" />'."\n"; |
|
353 | 353 | } |
354 | 354 | |
355 | 355 | return $field; |
@@ -379,15 +379,15 @@ discard block |
||
379 | 379 | * |
380 | 380 | * @var array |
381 | 381 | */ |
382 | - $_sortable = apply_filters( "FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen ); |
|
382 | + $_sortable = apply_filters("FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen); |
|
383 | 383 | |
384 | 384 | $sortable = array(); |
385 | - foreach ( $_sortable as $id => $data ) { |
|
386 | - if ( empty( $data ) ) |
|
385 | + foreach ($_sortable as $id => $data) { |
|
386 | + if (empty($data)) |
|
387 | 387 | continue; |
388 | 388 | |
389 | 389 | //fix for offset errors with WP_List_Table default get_columninfo() |
390 | - if ( is_array($data) ) { |
|
390 | + if (is_array($data)) { |
|
391 | 391 | $_data[0] = key($data); |
392 | 392 | $_data[1] = isset($data[1]) ? $data[1] : false; |
393 | 393 | } else { |
@@ -396,14 +396,14 @@ discard block |
||
396 | 396 | |
397 | 397 | $data = (array) $data; |
398 | 398 | |
399 | - if ( !isset( $data[1] ) ) |
|
399 | + if ( ! isset($data[1])) |
|
400 | 400 | $_data[1] = false; |
401 | 401 | |
402 | 402 | |
403 | 403 | $sortable[$id] = $_data; |
404 | 404 | } |
405 | 405 | $primary = $this->get_primary_column_name(); |
406 | - $this->_column_headers = array( $columns, $hidden, $sortable, $primary ); |
|
406 | + $this->_column_headers = array($columns, $hidden, $sortable, $primary); |
|
407 | 407 | } |
408 | 408 | |
409 | 409 | |
@@ -412,8 +412,8 @@ discard block |
||
412 | 412 | * @return string |
413 | 413 | */ |
414 | 414 | protected function get_primary_column_name() { |
415 | - foreach( class_parents( $this ) as $parent ) { |
|
416 | - if ( method_exists( $parent, 'get_primary_column_name' ) && $parent == 'WP_List_Table' ) { |
|
415 | + foreach (class_parents($this) as $parent) { |
|
416 | + if (method_exists($parent, 'get_primary_column_name') && $parent == 'WP_List_Table') { |
|
417 | 417 | return parent::get_primary_column_name(); |
418 | 418 | } |
419 | 419 | } |
@@ -430,10 +430,10 @@ discard block |
||
430 | 430 | * @param string $primary |
431 | 431 | * @return string |
432 | 432 | */ |
433 | - protected function handle_row_actions( $item, $column_name, $primary ) { |
|
434 | - foreach( class_parents( $this ) as $parent ) { |
|
435 | - if ( method_exists( $parent, 'handle_row_actions' ) && $parent == 'WP_List_Table' ) { |
|
436 | - return parent::handle_row_actions( $item, $column_name, $primary ); |
|
433 | + protected function handle_row_actions($item, $column_name, $primary) { |
|
434 | + foreach (class_parents($this) as $parent) { |
|
435 | + if (method_exists($parent, 'handle_row_actions') && $parent == 'WP_List_Table') { |
|
436 | + return parent::handle_row_actions($item, $column_name, $primary); |
|
437 | 437 | } |
438 | 438 | } |
439 | 439 | return ''; |
@@ -451,11 +451,11 @@ discard block |
||
451 | 451 | protected function _get_bulk_actions() { |
452 | 452 | $actions = array(); |
453 | 453 | //the _views property should have the bulk_actions, so let's go through and extract them into a properly formatted array for the wp_list_table(); |
454 | - foreach ( $this->_views as $view => $args) { |
|
455 | - if ( isset( $args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view ) |
|
454 | + foreach ($this->_views as $view => $args) { |
|
455 | + if (isset($args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view) |
|
456 | 456 | //each bulk action will correspond with a admin page route, so we can check whatever the capability is for that page route and skip adding the bulk action if no access for the current logged in user. |
457 | - foreach ( $args['bulk_action'] as $route =>$label ) { |
|
458 | - if ( $this->_admin_page->check_user_access( $route, true ) ) { |
|
457 | + foreach ($args['bulk_action'] as $route =>$label) { |
|
458 | + if ($this->_admin_page->check_user_access($route, true)) { |
|
459 | 459 | $actions[$route] = $label; |
460 | 460 | } |
461 | 461 | } |
@@ -473,18 +473,18 @@ discard block |
||
473 | 473 | */ |
474 | 474 | private function _filters() { |
475 | 475 | $classname = get_class($this); |
476 | - $filters = apply_filters( "FHEE__{$classname}__filters", (array) $this->_get_table_filters(), $this, $this->_screen ); |
|
476 | + $filters = apply_filters("FHEE__{$classname}__filters", (array) $this->_get_table_filters(), $this, $this->_screen); |
|
477 | 477 | |
478 | - if ( empty( $filters )) { |
|
478 | + if (empty($filters)) { |
|
479 | 479 | return; |
480 | 480 | } |
481 | - foreach ( $filters as $filter ) { |
|
481 | + foreach ($filters as $filter) { |
|
482 | 482 | echo $filter; |
483 | 483 | } |
484 | 484 | //add filter button at end |
485 | - echo '<input type="submit" class="button-secondary" value="' . __('Filter', 'event_espresso') . '" id="post-query-submit" />'; |
|
485 | + echo '<input type="submit" class="button-secondary" value="'.__('Filter', 'event_espresso').'" id="post-query-submit" />'; |
|
486 | 486 | //add reset filters button at end |
487 | - echo '<a class="button button-secondary" href="' . $this->_admin_page->get_current_page_view_url() . '" style="display:inline-block">' . __('Reset Filters', 'event_espresso') . '</a>'; |
|
487 | + echo '<a class="button button-secondary" href="'.$this->_admin_page->get_current_page_view_url().'" style="display:inline-block">'.__('Reset Filters', 'event_espresso').'</a>'; |
|
488 | 488 | } |
489 | 489 | |
490 | 490 | |
@@ -498,8 +498,8 @@ discard block |
||
498 | 498 | * @param string $column_name |
499 | 499 | * @return string |
500 | 500 | */ |
501 | - public function set_primary_column( $column_name ) { |
|
502 | - return ! empty( $this->_primary_column ) ? $this->_primary_column : $column_name; |
|
501 | + public function set_primary_column($column_name) { |
|
502 | + return ! empty($this->_primary_column) ? $this->_primary_column : $column_name; |
|
503 | 503 | } |
504 | 504 | |
505 | 505 | |
@@ -518,7 +518,7 @@ discard block |
||
518 | 518 | array( |
519 | 519 | 'total_items' => $total_items, |
520 | 520 | 'per_page' => $this->_per_page, |
521 | - 'total_pages' => ceil($total_items / $this->_per_page ) |
|
521 | + 'total_pages' => ceil($total_items / $this->_per_page) |
|
522 | 522 | ) |
523 | 523 | ); |
524 | 524 | } |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | * |
535 | 535 | * @return string html content for the column |
536 | 536 | */ |
537 | - public function column_default( $item, $column_name ) { |
|
537 | + public function column_default($item, $column_name) { |
|
538 | 538 | /** |
539 | 539 | * Dynamic hook allowing for adding additional column content in this list table. |
540 | 540 | * Note that $this->screen->id is in the format |
@@ -544,7 +544,7 @@ discard block |
||
544 | 544 | * hook prefix ("event-espresso") will be different. |
545 | 545 | * |
546 | 546 | */ |
547 | - do_action( 'AHEE__EE_Admin_List_Table__column_' . $column_name . '__' . $this->screen->id, $item, $this->_screen ); |
|
547 | + do_action('AHEE__EE_Admin_List_Table__column_'.$column_name.'__'.$this->screen->id, $item, $this->_screen); |
|
548 | 548 | } |
549 | 549 | |
550 | 550 | |
@@ -560,7 +560,7 @@ discard block |
||
560 | 560 | * |
561 | 561 | * @var array |
562 | 562 | */ |
563 | - $columns = apply_filters( 'FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen ); |
|
563 | + $columns = apply_filters('FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen); |
|
564 | 564 | return $columns; |
565 | 565 | } |
566 | 566 | |
@@ -572,18 +572,18 @@ discard block |
||
572 | 572 | $views = $this->get_views(); |
573 | 573 | $assembled_views = ''; |
574 | 574 | |
575 | - if ( empty( $views )) { |
|
575 | + if (empty($views)) { |
|
576 | 576 | return; |
577 | 577 | } |
578 | 578 | echo "<ul class='subsubsub'>\n"; |
579 | - foreach ( $views as $view ) { |
|
580 | - $count = isset($view['count'] ) && !empty($view['count']) ? absint( $view['count'] ) : 0; |
|
581 | - if ( isset( $view['slug'] ) && isset( $view['class'] ) && isset( $view['url'] ) && isset( $view['label']) ) { |
|
582 | - $assembled_views[ $view['slug'] ] = "\t<li class='" . $view['class'] . "'>" . '<a href="' . $view['url'] . '">' . $view['label'] . '</a> <span class="count">(' . $count . ')</span>'; |
|
579 | + foreach ($views as $view) { |
|
580 | + $count = isset($view['count']) && ! empty($view['count']) ? absint($view['count']) : 0; |
|
581 | + if (isset($view['slug']) && isset($view['class']) && isset($view['url']) && isset($view['label'])) { |
|
582 | + $assembled_views[$view['slug']] = "\t<li class='".$view['class']."'>".'<a href="'.$view['url'].'">'.$view['label'].'</a> <span class="count">('.$count.')</span>'; |
|
583 | 583 | } |
584 | 584 | } |
585 | 585 | |
586 | - echo is_array( $assembled_views) && ! empty( $assembled_views ) ? implode( " |</li>\n", $assembled_views ) . "</li>\n" : ''; |
|
586 | + echo is_array($assembled_views) && ! empty($assembled_views) ? implode(" |</li>\n", $assembled_views)."</li>\n" : ''; |
|
587 | 587 | echo "</ul>"; |
588 | 588 | } |
589 | 589 | |
@@ -596,10 +596,10 @@ discard block |
||
596 | 596 | * |
597 | 597 | * @param object $item The current item |
598 | 598 | */ |
599 | - public function single_row( $item ) { |
|
600 | - $row_class = $this->_get_row_class( $item ); |
|
601 | - echo '<tr class="' . esc_attr( $row_class ) . '">'; |
|
602 | - $this->single_row_columns( $item ); |
|
599 | + public function single_row($item) { |
|
600 | + $row_class = $this->_get_row_class($item); |
|
601 | + echo '<tr class="'.esc_attr($row_class).'">'; |
|
602 | + $this->single_row_columns($item); |
|
603 | 603 | echo '</tr>'; |
604 | 604 | } |
605 | 605 | |
@@ -610,13 +610,13 @@ discard block |
||
610 | 610 | * @param object $item the current item |
611 | 611 | * @return string |
612 | 612 | */ |
613 | - protected function _get_row_class( $item ) { |
|
613 | + protected function _get_row_class($item) { |
|
614 | 614 | static $row_class = ''; |
615 | - $row_class = ( $row_class == '' ? 'alternate' : '' ); |
|
615 | + $row_class = ($row_class == '' ? 'alternate' : ''); |
|
616 | 616 | |
617 | 617 | $new_row_class = $row_class; |
618 | 618 | |
619 | - if ( !empty($this->_ajax_sorting_callback) ) { |
|
619 | + if ( ! empty($this->_ajax_sorting_callback)) { |
|
620 | 620 | $new_row_class .= ' rowsortable'; |
621 | 621 | } |
622 | 622 | |
@@ -635,13 +635,13 @@ discard block |
||
635 | 635 | |
636 | 636 | public function get_hidden_columns() { |
637 | 637 | $user_id = get_current_user_id(); |
638 | - $has_default = get_user_option('default'. $this->screen->id . 'columnshidden', $user_id); |
|
639 | - if ( empty( $has_default ) && !empty($this->_hidden_columns ) ) { |
|
640 | - update_user_option($user_id, 'default'.$this->screen->id . 'columnshidden', TRUE); |
|
641 | - update_user_option($user_id, 'manage' . $this->screen->id . 'columnshidden', $this->_hidden_columns, TRUE ); |
|
638 | + $has_default = get_user_option('default'.$this->screen->id.'columnshidden', $user_id); |
|
639 | + if (empty($has_default) && ! empty($this->_hidden_columns)) { |
|
640 | + update_user_option($user_id, 'default'.$this->screen->id.'columnshidden', TRUE); |
|
641 | + update_user_option($user_id, 'manage'.$this->screen->id.'columnshidden', $this->_hidden_columns, TRUE); |
|
642 | 642 | } |
643 | - $ref = 'manage' . $this->screen->id . 'columnshidden'; |
|
644 | - $saved_columns = (array) get_user_option( $ref, $user_id ); |
|
643 | + $ref = 'manage'.$this->screen->id.'columnshidden'; |
|
644 | + $saved_columns = (array) get_user_option($ref, $user_id); |
|
645 | 645 | return $saved_columns; |
646 | 646 | } |
647 | 647 | |
@@ -656,47 +656,47 @@ discard block |
||
656 | 656 | * |
657 | 657 | * @param object $item The current item |
658 | 658 | */ |
659 | - public function single_row_columns( $item ) { |
|
660 | - list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); |
|
659 | + public function single_row_columns($item) { |
|
660 | + list($columns, $hidden, $sortable, $primary) = $this->get_column_info(); |
|
661 | 661 | |
662 | 662 | global $wp_version; |
663 | - $use_hidden_class = version_compare( $wp_version, '4.3-RC', '>=' ); |
|
663 | + $use_hidden_class = version_compare($wp_version, '4.3-RC', '>='); |
|
664 | 664 | |
665 | - foreach ( $columns as $column_name => $column_display_name ) { |
|
665 | + foreach ($columns as $column_name => $column_display_name) { |
|
666 | 666 | |
667 | 667 | /** |
668 | 668 | * With WordPress version 4.3.RC+ WordPress started using the hidden css class to control whether columns are |
669 | 669 | * hidden or not instead of using "display:none;". This bit of code provides backward compat. |
670 | 670 | */ |
671 | - $hidden_class = $use_hidden_class && in_array( $column_name, $hidden ) ? ' hidden' : ''; |
|
672 | - $style = ! $use_hidden_class && in_array( $column_name, $hidden ) ? ' style="display:none;"' : ''; |
|
671 | + $hidden_class = $use_hidden_class && in_array($column_name, $hidden) ? ' hidden' : ''; |
|
672 | + $style = ! $use_hidden_class && in_array($column_name, $hidden) ? ' style="display:none;"' : ''; |
|
673 | 673 | |
674 | - $classes = $column_name . ' column-' . $column_name.$hidden_class; |
|
675 | - if ( $primary == $column_name ) { |
|
674 | + $classes = $column_name.' column-'.$column_name.$hidden_class; |
|
675 | + if ($primary == $column_name) { |
|
676 | 676 | $classes .= ' has-row-actions column-primary'; |
677 | 677 | } |
678 | 678 | |
679 | - $data = ' data-colname="' . wp_strip_all_tags( $column_display_name ) . '"'; |
|
679 | + $data = ' data-colname="'.wp_strip_all_tags($column_display_name).'"'; |
|
680 | 680 | |
681 | 681 | $class = "class='$classes'"; |
682 | 682 | |
683 | 683 | $attributes = "$class$style$data"; |
684 | 684 | |
685 | - if ( 'cb' === $column_name ) { |
|
685 | + if ('cb' === $column_name) { |
|
686 | 686 | echo '<th scope="row" class="check-column">'; |
687 | - echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb( $item ), $item, $this ); |
|
687 | + echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb($item), $item, $this); |
|
688 | 688 | echo '</th>'; |
689 | 689 | } |
690 | - elseif ( method_exists( $this, 'column_' . $column_name ) ) { |
|
690 | + elseif (method_exists($this, 'column_'.$column_name)) { |
|
691 | 691 | echo "<td $attributes>"; |
692 | - echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content', call_user_func( array( $this, 'column_' . $column_name ), $item ), $item, $this ); |
|
693 | - echo $this->handle_row_actions( $item, $column_name, $primary ); |
|
692 | + echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_'.$column_name.'__column_content', call_user_func(array($this, 'column_'.$column_name), $item), $item, $this); |
|
693 | + echo $this->handle_row_actions($item, $column_name, $primary); |
|
694 | 694 | echo "</td>"; |
695 | 695 | } |
696 | 696 | else { |
697 | 697 | echo "<td $attributes>"; |
698 | - echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default( $item, $column_name ), $item, $column_name, $this ); |
|
699 | - echo $this->handle_row_actions( $item, $column_name, $primary ); |
|
698 | + echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default($item, $column_name), $item, $column_name, $this); |
|
699 | + echo $this->handle_row_actions($item, $column_name, $primary); |
|
700 | 700 | echo "</td>"; |
701 | 701 | } |
702 | 702 | } |
@@ -704,19 +704,19 @@ discard block |
||
704 | 704 | |
705 | 705 | |
706 | 706 | |
707 | - public function extra_tablenav( $which ) { |
|
708 | - if ( $which == 'top' ) { |
|
707 | + public function extra_tablenav($which) { |
|
708 | + if ($which == 'top') { |
|
709 | 709 | $this->_filters(); |
710 | 710 | echo $this->_get_hidden_fields(); |
711 | 711 | echo '<br class="clear">'; |
712 | - }else{ |
|
712 | + } else { |
|
713 | 713 | echo '<div class="list-table-bottom-buttons alignleft actions">'; |
714 | - foreach($this->_bottom_buttons as $type => $action){ |
|
715 | - $route = isset( $action['route'] ) ? $action['route'] : ''; |
|
716 | - $extra_request = isset( $action['extra_request'] ) ? $action['extra_request'] : ''; |
|
714 | + foreach ($this->_bottom_buttons as $type => $action) { |
|
715 | + $route = isset($action['route']) ? $action['route'] : ''; |
|
716 | + $extra_request = isset($action['extra_request']) ? $action['extra_request'] : ''; |
|
717 | 717 | echo $this->_admin_page->get_action_link_or_button($route, $type, $extra_request); |
718 | 718 | } |
719 | - do_action( 'AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen ); |
|
719 | + do_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen); |
|
720 | 720 | echo '</div>'; |
721 | 721 | } |
722 | 722 | //echo $this->_entries_per_page_dropdown; |
@@ -766,13 +766,13 @@ discard block |
||
766 | 766 | * |
767 | 767 | * @return string The assembled action elements container. |
768 | 768 | */ |
769 | - protected function _action_string( $action_items, $item, $action_container = 'ul', $action_class = '', $action_id = '' ) { |
|
769 | + protected function _action_string($action_items, $item, $action_container = 'ul', $action_class = '', $action_id = '') { |
|
770 | 770 | $content = ''; |
771 | - $action_class = ! empty( $action_class ) ? ' class="' . $action_class . '"' : ''; |
|
772 | - $action_id = ! empty( $action_id ) ? ' id="' . $action_id . '"' : ''; |
|
773 | - $content .= ! empty( $action_container ) ? '<' . $action_container . $action_class . $action_id . '>' : ''; |
|
774 | - $content .= apply_filters( 'FHEE__EE_Admin_List_Table___action_string__action_items', $action_items, $item, $this ); |
|
775 | - $content .= ! empty( $action_container ) ? '</' . $action_container . '>' : ''; |
|
771 | + $action_class = ! empty($action_class) ? ' class="'.$action_class.'"' : ''; |
|
772 | + $action_id = ! empty($action_id) ? ' id="'.$action_id.'"' : ''; |
|
773 | + $content .= ! empty($action_container) ? '<'.$action_container.$action_class.$action_id.'>' : ''; |
|
774 | + $content .= apply_filters('FHEE__EE_Admin_List_Table___action_string__action_items', $action_items, $item, $this); |
|
775 | + $content .= ! empty($action_container) ? '</'.$action_container.'>' : ''; |
|
776 | 776 | return $content; |
777 | 777 | } |
778 | 778 | } |