← All changes | formidable.php +15 -31 6.25 → 6.20 View file →

		@@ -1,9 +1,9 @@
1	1	<?php
2	2	/**
3	3	* Plugin Name: Formidable Forms
4	4	* Description: Quickly and easily create drag-and-drop forms
5		- * Version: 6.25
	5	+ * Version: 6.20
6	6	* Plugin URI: https://formidableforms.com/
7	7	* Author URI: https://formidableforms.com/
8	8	* Author: Strategy11 Form Builder Team
9	9	* Text Domain: formidable
		@@ -106,43 +106,27 @@
106	106	require $filepath . $class_name . '.php';
107	107	return;
108	108	}
109	109
110		- if ( preg_match( '/^FrmStrpLite.+$/', $class_name ) || preg_match( '/^FrmTransLite.+$/', $class_name ) ) {
111		- // Autoload for /stripe/ folder.
112		- $filepath = $original_filepath . '/stripe/';
113		- if ( preg_match( '/^.+Helper$/', $class_name ) ) {
114		- $filepath .= 'helpers/';
115		- } elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {
116		- $filepath .= 'controllers/';
117		- } else {
118		- $filepath .= 'models/';
119		- }
120		-
121		- $filepath .= $class_name . '.php';
122		-
123		- if ( file_exists( $filepath ) ) {
124		- require $filepath;
125		- }
126		-
	110	+ if ( ! preg_match( '/^FrmStrpLite.+$/', $class_name ) && ! preg_match( '/^FrmTransLite.+$/', $class_name ) ) {
	111	+ // Exit early if the class does not match the Stripe Lite prefix.
127	112	return;
128	113	}
129	114
130		- if ( preg_match( '/^FrmSquareLite.+$/', $class_name ) ) {
131		- $filepath = $original_filepath . '/square/';
132		- if ( preg_match( '/^.+Helper$/', $class_name ) ) {
133		- $filepath .= 'helpers/';
134		- } elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {
135		- $filepath .= 'controllers/';
136		- } else {
137		- $filepath .= 'models/';
138		- }
	115	+ // Autoload for /stripe/ folder.
	116	+ $filepath = $original_filepath . '/stripe/';
	117	+ if ( preg_match( '/^.+Helper$/', $class_name ) ) {
	118	+ $filepath .= 'helpers/';
	119	+ } elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {
	120	+ $filepath .= 'controllers/';
	121	+ } else {
	122	+ $filepath .= 'models/';
	123	+ }
139	124
140		- $filepath .= $class_name . '.php';
	125	+ $filepath .= $class_name . '.php';
141	126
142		- if ( file_exists( $filepath ) ) {
143		- require $filepath;
144		- }
	127	+ if ( file_exists( $filepath ) ) {
	128	+ require $filepath;
145	129	}
146	130	}
147	131
148	132	add_action( 'activate_' . FrmAppHelper::plugin_folder() . '/formidable.php', 'frm_maybe_install' );