← All changes | formidable.php +17 -15 6.5.3 → 6.8 View file →

		@@ -1,14 +1,16 @@
1	1	<?php
2		-/*
3		-Plugin Name: Formidable Forms
4		-Description: Quickly and easily create drag-and-drop forms
5		-Version: 6.5.3
6		-Plugin URI: https://formidableforms.com/
7		-Author URI: https://formidableforms.com/
8		-Author: Strategy11 Form Builder Team
9		-Text Domain: formidable
10		-*/
	2	+/**
	3	+ * Plugin Name: Formidable Forms
	4	+ * Description: Quickly and easily create drag-and-drop forms
	5	+ * Version: 6.8
	6	+ * Plugin URI: https://formidableforms.com/
	7	+ * Author URI: https://formidableforms.com/
	8	+ * Author: Strategy11 Form Builder Team
	9	+ * Text Domain: formidable
	10	+ *
	11	+ * @package Formidable
	12	+ */
11	13
12	14	/*
13	15	Copyright 2010 Formidable Forms
14	16
		@@ -47,14 +49,14 @@
47	49
48	50	FrmHooksController::trigger_load_hook();
49	51	}
50	52
51		-// if __autoload is active, put it on the spl_autoload stack
	53	+// If __autoload is active, put it on the spl_autoload stack.
52	54	if ( is_array( spl_autoload_functions() ) && in_array( '__autoload', spl_autoload_functions(), true ) ) {
53	55	spl_autoload_register( '__autoload' );
54	56	}
55	57
56		-// Add the autoloader
	58	+// Add the autoloader.
57	59	spl_autoload_register( 'frm_forms_autoloader' );
58	60
59	61	/**
60	62	* @return void
		@@ -59,9 +61,9 @@
59	61	/**
60	62	* @return void
61	63	*/
62	64	function frm_forms_autoloader( $class_name ) {
63		- // Only load Frm classes here
	65	+ // Only load Frm classes here.
64	66	if ( ! preg_match( '/^Frm.+$/', $class_name ) || preg_match( '/^FrmPro.+$/', $class_name ) ) {
65	67	return;
66	68	}
67	69
		@@ -75,9 +77,9 @@
75	77	*
76	78	* @return void
77	79	*/
78	80	function frm_class_autoloader( $class_name, $filepath ) {
79		- $deprecated = array( 'FrmPointers', 'FrmEDD_SL_Plugin_Updater' );
	81	+ $deprecated = array( 'FrmPointers', 'FrmEDD_SL_Plugin_Updater', 'FrmWelcomeController' );
80	82	$is_deprecated = in_array( $class_name, $deprecated, true ) || preg_match( '/^.+Deprecate/', $class_name );
81	83	$original_filepath = $filepath;
82	84
83	85	if ( $is_deprecated ) {
		@@ -132,10 +134,10 @@
132	134	*
133	135	* @return void
134	136	*/
135	137	function frm_maybe_install() {
136		- if ( get_transient( FrmWelcomeController::$option_name ) !== 'no' ) {
137		- set_transient( FrmWelcomeController::$option_name, FrmWelcomeController::$menu_slug, 60 );
	138	+ if ( get_transient( FrmDashboardController::REDIRECT_META_NAME ) !== 'no' ) {
	139	+ set_transient( FrmDashboardController::REDIRECT_META_NAME, FrmDashboardController::PAGE_SLUG, 60 );
138	140	}
139	141
140	142	FrmAppController::handle_activation();
141	143	}