← All changes | formidable.php +15 -33 6.25 → 6.12 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.12
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
		@@ -91,10 +91,8 @@
91	91	} elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {
92	92	$filepath .= 'controllers/';
93	93	} elseif ( preg_match( '/^.+Factory$/', $class_name ) ) {
94	94	$filepath .= 'factories/';
95		- } elseif ( preg_match( '/^.+StyleComponent$/', $class_name ) ) {
96		- $filepath .= 'views/styles/components/';
97	95	} else {
98	96	$filepath .= 'models/';
99	97	if ( strpos( $class_name, 'Field' ) && ! file_exists( $filepath . $class_name . '.php' ) ) {
100	98	$filepath .= 'fields/';
		@@ -106,43 +104,27 @@
106	104	require $filepath . $class_name . '.php';
107	105	return;
108	106	}
109	107
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		-
	108	+ if ( ! preg_match( '/^FrmStrpLite.+$/', $class_name ) && ! preg_match( '/^FrmTransLite.+$/', $class_name ) ) {
	109	+ // Exit early if the class does not match the Stripe Lite prefix.
127	110	return;
128	111	}
129	112
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		- }
	113	+ // Autoload for /stripe/ folder.
	114	+ $filepath = $original_filepath . '/stripe/';
	115	+ if ( preg_match( '/^.+Helper$/', $class_name ) ) {
	116	+ $filepath .= 'helpers/';
	117	+ } elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {
	118	+ $filepath .= 'controllers/';
	119	+ } else {
	120	+ $filepath .= 'models/';
	121	+ }
139	122
140		- $filepath .= $class_name . '.php';
	123	+ $filepath .= $class_name . '.php';
141	124
142		- if ( file_exists( $filepath ) ) {
143		- require $filepath;
144		- }
	125	+ if ( file_exists( $filepath ) ) {
	126	+ require $filepath;
145	127	}
146	128	}
147	129
148	130	add_action( 'activate_' . FrmAppHelper::plugin_folder() . '/formidable.php', 'frm_maybe_install' );