← All changes | classes/models/FrmInstallerSkin.php +5 -22 6.26.1 → 4.07.01 View file →

		@@ -1,9 +1,8 @@
1	1	<?php
2	2	/**
3	3	* @since 3.04.02
4	4	*
5		- * @package Formidable
6	5	* @subpackage Upgrader Skin
7	6	*/
8	7
9	8	// Exit if accessed directly
		@@ -23,10 +22,8 @@
23	22	*
24	23	* @since 3.04.02
25	24	*
26	25	* @param object $upgrader The upgrader object (passed by reference).
27		- *
28		- * @return void
29	26	*/
30	27	public function set_upgrader( &$upgrader ) {
31	28	if ( is_object( $upgrader ) ) {
32	29	$this->upgrader =& $upgrader;
		@@ -38,10 +35,8 @@
38	35	*
39	36	* @since 3.04.02
40	37	*
41	38	* @param object $result The result of the install process.
42		- *
43		- * @return void
44	39	*/
45	40	public function set_result( $result ) {
46	41	$this->result = $result;
47	42	}
		@@ -66,30 +61,17 @@
66	61	* back to the Ajax script for processing.
67	62	*
68	63	* @since 3.04.02
69	64	*
70		- * @param string|\WP_Error $errors The WP Error object of errors with the install process.
	65	+ * @param string|object $errors The WP Error object of errors with the install process.
71	66	*/
72	67	public function error( $errors ) {
73	68	if ( ! empty( $errors ) ) {
74	69	if ( ! is_string( $errors ) ) {
75		- $error = $errors->get_error_message();
76		- $message = $errors->get_error_data();
77		- $errors = $error . ' ' . $message;
	70	+ $errors = $errors->get_error_message();
78	71	}
79		- echo json_encode(
80		- array(
81		- 'error' => $errors,
82		- 'message' => $errors,
83		- 'success' => false,
84		- )
85		- );
86		-
87		- if ( wp_doing_ajax() ) {
88		- wp_die();
89		- } else {
90		- die();
91		- }
	72	+ echo json_encode( array( 'error' => $errors ) );
	73	+ wp_die();
92	74	}
93	75	}
94	76
95	77	/**
		@@ -101,5 +83,6 @@
101	83	* @param string $string The feedback string.
102	84	* @param mixed ...$args Optional text replacements.
103	85	*/
104	86	public function feedback( $string, ...$args ) {}
	87	+
105	88	}