← All changes | includes/class-wp-convertkit.php +32 -24 2.3.2 → 2.7.4 View file →

		@@ -66,8 +66,9 @@
66	66
67	67	$this->classes['admin_bulk_edit'] = new ConvertKit_Admin_Bulk_Edit();
68	68	$this->classes['admin_cache_plugins'] = new ConvertKit_Admin_Cache_Plugins();
69	69	$this->classes['admin_category'] = new ConvertKit_Admin_Category();
	70	+ $this->classes['admin_landing_page'] = new ConvertKit_Admin_Landing_Page();
70	71	$this->classes['admin_notices'] = new ConvertKit_Admin_Notices();
71	72	$this->classes['admin_post'] = new ConvertKit_Admin_Post();
72	73	$this->classes['admin_quick_edit'] = new ConvertKit_Admin_Quick_Edit();
73	74	$this->classes['admin_refresh_resources'] = new ConvertKit_Admin_Refresh_Resources();
		@@ -72,8 +73,9 @@
72	73	$this->classes['admin_quick_edit'] = new ConvertKit_Admin_Quick_Edit();
73	74	$this->classes['admin_refresh_resources'] = new ConvertKit_Admin_Refresh_Resources();
74	75	$this->classes['admin_restrict_content'] = new ConvertKit_Admin_Restrict_Content();
75	76	$this->classes['admin_settings'] = new ConvertKit_Admin_Settings();
	77	+ $this->classes['admin_setup_wizard_landing_page'] = new ConvertKit_Admin_Setup_Wizard_Landing_Page();
76	78	$this->classes['admin_setup_wizard_plugin'] = new ConvertKit_Admin_Setup_Wizard_Plugin();
77	79	$this->classes['admin_setup_wizard_restrict_content'] = new ConvertKit_Admin_Setup_Wizard_Restrict_Content();
78	80	$this->classes['admin_tinymce'] = new ConvertKit_Admin_TinyMCE();
79	81	$this->classes['admin_user'] = new ConvertKit_Admin_User();
		@@ -140,10 +142,11 @@
140	142	if ( is_admin() ) {
141	143	return;
142	144	}
143	145
144		- $this->classes['output'] = new ConvertKit_Output();
145		- $this->classes['output_restrict_content'] = new ConvertKit_Output_Restrict_Content();
	146	+ $this->classes['cache_plugins'] = new ConvertKit_Cache_Plugins();
	147	+ $this->classes['output'] = new ConvertKit_Output();
	148	+ $this->classes['output_broadcasts'] = new ConvertKit_Output_Broadcasts();
146	149
147	150	/**
148	151	* Initialize integration classes for the frontend web site.
149	152	*
		@@ -160,30 +163,34 @@
160	163	* @since 1.9.6
161	164	*/
162	165	private function initialize_global() {
163	166
164		- $this->classes['ajax'] = new ConvertKit_AJAX();
165		- $this->classes['blocks_convertkit_broadcasts'] = new ConvertKit_Block_Broadcasts();
166		- $this->classes['blocks_convertkit_content'] = new ConvertKit_Block_Content();
167		- $this->classes['blocks_convertkit_formtrigger'] = new ConvertKit_Block_Form_Trigger();
168		- $this->classes['blocks_convertkit_form'] = new ConvertKit_Block_Form();
169		- $this->classes['blocks_convertkit_product'] = new ConvertKit_Block_Product();
170		- $this->classes['block_formatter_form_link'] = new ConvertKit_Block_Formatter_Form_Link();
171		- $this->classes['block_formatter_product_link'] = new ConvertKit_Block_Formatter_Product_Link();
172		- $this->classes['broadcasts_importer'] = new ConvertKit_Broadcasts_Importer();
173		- $this->classes['elementor'] = new ConvertKit_Elementor();
174		- $this->classes['gutenberg'] = new ConvertKit_Gutenberg();
175		- $this->classes['media_library'] = new ConvertKit_Media_Library();
176		- $this->classes['review_request'] = new ConvertKit_Review_Request( 'ConvertKit', 'convertkit', CONVERTKIT_PLUGIN_PATH );
177		- $this->classes['preview_output'] = new ConvertKit_Preview_Output();
178		- $this->classes['setup'] = new ConvertKit_Setup();
179		- $this->classes['shortcodes'] = new ConvertKit_Shortcodes();
180		- $this->classes['widgets'] = new ConvertKit_Widgets();
	167	+ $this->classes['ajax'] = new ConvertKit_AJAX();
	168	+ $this->classes['blocks_convertkit_broadcasts'] = new ConvertKit_Block_Broadcasts();
	169	+ $this->classes['blocks_convertkit_content'] = new ConvertKit_Block_Content();
	170	+ $this->classes['blocks_convertkit_formtrigger'] = new ConvertKit_Block_Form_Trigger();
	171	+ $this->classes['blocks_convertkit_form'] = new ConvertKit_Block_Form();
	172	+ $this->classes['blocks_convertkit_product'] = new ConvertKit_Block_Product();
	173	+ $this->classes['block_formatter_form_link'] = new ConvertKit_Block_Formatter_Form_Link();
	174	+ $this->classes['block_formatter_product_link'] = new ConvertKit_Block_Formatter_Product_Link();
	175	+ $this->classes['pre_publish_action_broadcast_export'] = new ConvertKit_Pre_Publish_Action_Broadcast_Export();
	176	+ $this->classes['broadcasts_exporter'] = new ConvertKit_Broadcasts_Exporter();
	177	+ $this->classes['broadcasts_importer'] = new ConvertKit_Broadcasts_Importer();
	178	+ $this->classes['divi'] = new ConvertKit_Divi();
	179	+ $this->classes['elementor'] = new ConvertKit_Elementor();
	180	+ $this->classes['gutenberg'] = new ConvertKit_Gutenberg();
	181	+ $this->classes['media_library'] = new ConvertKit_Media_Library();
	182	+ $this->classes['output_restrict_content'] = new ConvertKit_Output_Restrict_Content();
	183	+ $this->classes['review_request'] = new ConvertKit_Review_Request( 'Kit', 'convertkit', CONVERTKIT_PLUGIN_PATH );
	184	+ $this->classes['preview_output'] = new ConvertKit_Preview_Output();
	185	+ $this->classes['setup'] = new ConvertKit_Setup();
	186	+ $this->classes['shortcodes'] = new ConvertKit_Shortcodes();
	187	+ $this->classes['widgets'] = new ConvertKit_Widgets();
181	188
182	189	// Run the setup's update process on WordPress' init hook.
183	190	// Doing this sooner may result in errors with WordPress functions that are not yet
184	191	// available to the update routine.
185		- add_action( 'init', array( $this, 'update' ) );
	192	+ add_action( 'init', array( $this, 'init' ) );
186	193
187	194	/**
188	195	* Initialize integration classes for the frontend web site.
189	196	*
		@@ -193,16 +200,17 @@
193	200
194	201	}
195	202
196	203	/**
197		- * Runs the Plugin's update routine, which checks if
	204	+ * Runs the Plugin's initialization and update routines, which checks if
198	205	* the Plugin has just been updated to a newer version,
199	206	* and if so runs any specific processes that might be needed.
200	207	*
201	208	* @since 1.9.7.4
202	209	*/
203		- public function update() {
	210	+ public function init() {
204	211
	212	+ $this->get_class( 'setup' )->initialize();
205	213	$this->get_class( 'setup' )->update();
206	214
207	215	}
208	216
		@@ -389,9 +397,9 @@
389	397	$error = new WP_Error(
390	398	'convertkit_get_class',
391	399	sprintf(
392	400	/* translators: %1$s: PHP class name */
393		- __( 'ConvertKit Error: Could not load Plugin class <strong>%1$s</strong>', 'convertkit' ),
	401	+ __( 'Kit Error: Could not load Plugin class <strong>%1$s</strong>', 'convertkit' ),
394	402	$name
395	403	)
396	404	);
397	405
		@@ -399,9 +407,9 @@
399	407	// Admin UI.
400	408	if ( is_admin() ) {
401	409	wp_die(
402	410	esc_attr( $error->get_error_message() ),
403		- esc_html__( 'ConvertKit Error', 'convertkit' ),
	411	+ esc_html__( 'Kit Error', 'convertkit' ),
404	412	array(
405	413	'back_link' => true,
406	414	)
407	415	);