|
@@ -22,31 +22,31 @@ discard block |
|
|
block discarded – undo |
|
22
|
22
|
* @param EE_Response $response |
|
23
|
23
|
* @return EE_Response |
|
24
|
24
|
*/ |
|
25
|
|
- public function handle_request( EE_Request $request, EE_Response $response ) { |
|
|
25
|
+ public function handle_request(EE_Request $request, EE_Response $response) { |
|
26
|
26
|
$this->_request = $request; |
|
27
|
27
|
$this->_response = $response; |
|
28
|
28
|
//$this->_response->add_output( "\n\t IN >> " . __CLASS__ ); |
|
29
|
29
|
//$this->_response->set_notice( 1, 'hey look at this' ); |
|
30
|
30
|
// check required WP version |
|
31
|
|
- if ( ! $this->_minimum_wp_version_required() ) { |
|
32
|
|
- $this->_request->un_set( 'activate', true ); |
|
33
|
|
- add_action( 'admin_notices', array( $this, 'minimum_wp_version_error' ), 1 ); |
|
|
31
|
+ if ( ! $this->_minimum_wp_version_required()) { |
|
|
32
|
+ $this->_request->un_set('activate', true); |
|
|
33
|
+ add_action('admin_notices', array($this, 'minimum_wp_version_error'), 1); |
|
34
|
34
|
//$this->_response->add_output( "\n<br />" . 'minimum_wp_version_error' ); |
|
35
|
35
|
$this->_response->terminate_request(); |
|
36
|
36
|
} |
|
37
|
37
|
// check required PHP version |
|
38
|
|
- if ( ! $this->_minimum_php_version_required() ) { |
|
39
|
|
- $this->_request->un_set( 'activate', true ); |
|
40
|
|
- add_action( 'admin_notices', array( $this, 'minimum_php_version_error' ), 1 ); |
|
|
38
|
+ if ( ! $this->_minimum_php_version_required()) { |
|
|
39
|
+ $this->_request->un_set('activate', true); |
|
|
40
|
+ add_action('admin_notices', array($this, 'minimum_php_version_error'), 1); |
|
41
|
41
|
//$this->_response->add_output( "\n<br />" . 'minimum_php_version_error' ); |
|
42
|
42
|
$this->_response->terminate_request(); |
|
43
|
43
|
} |
|
44
|
44
|
// check recommended PHP version |
|
45
|
|
- if ( ! $this->_minimum_php_version_recommended() ) { |
|
|
45
|
+ if ( ! $this->_minimum_php_version_recommended()) { |
|
46
|
46
|
$this->_display_minimum_recommended_php_version_notice(); |
|
47
|
47
|
} |
|
48
|
48
|
$this->_test_for_php_version_7(); |
|
49
|
|
- $this->_response = $this->process_request_stack( $this->_request, $this->_response ); |
|
|
49
|
+ $this->_response = $this->process_request_stack($this->_request, $this->_response); |
|
50
|
50
|
//$this->_response->add_output( "\n\t OUT << " . __CLASS__ ); |
|
51
|
51
|
return $this->_response; |
|
52
|
52
|
} |
|
@@ -60,9 +60,9 @@ discard block |
|
|
block discarded – undo |
|
60
|
60
|
* @param string $min_version |
|
61
|
61
|
* @return boolean |
|
62
|
62
|
*/ |
|
63
|
|
- private function _check_wp_version( $min_version = EE_MIN_WP_VER_REQUIRED ) { |
|
|
63
|
+ private function _check_wp_version($min_version = EE_MIN_WP_VER_REQUIRED) { |
|
64
|
64
|
global $wp_version; |
|
65
|
|
- return version_compare( $wp_version, $min_version, '>=' ) ? true : false; |
|
|
65
|
+ return version_compare($wp_version, $min_version, '>=') ? true : false; |
|
66
|
66
|
} |
|
67
|
67
|
|
|
68
|
68
|
|
|
@@ -74,7 +74,7 @@ discard block |
|
|
block discarded – undo |
|
74
|
74
|
* @return boolean |
|
75
|
75
|
*/ |
|
76
|
76
|
private function _minimum_wp_version_required() { |
|
77
|
|
- return $this->_check_wp_version( EE_MIN_WP_VER_REQUIRED ); |
|
|
77
|
+ return $this->_check_wp_version(EE_MIN_WP_VER_REQUIRED); |
|
78
|
78
|
} |
|
79
|
79
|
|
|
80
|
80
|
|
|
@@ -86,8 +86,8 @@ discard block |
|
|
block discarded – undo |
|
86
|
86
|
* @param string $min_version |
|
87
|
87
|
* @return boolean |
|
88
|
88
|
*/ |
|
89
|
|
- private function _check_php_version( $min_version = EE_MIN_PHP_VER_RECOMMENDED ) { |
|
90
|
|
- return version_compare( PHP_VERSION, $min_version, '>=' ) ? true : false; |
|
|
89
|
+ private function _check_php_version($min_version = EE_MIN_PHP_VER_RECOMMENDED) { |
|
|
90
|
+ return version_compare(PHP_VERSION, $min_version, '>=') ? true : false; |
|
91
|
91
|
} |
|
92
|
92
|
|
|
93
|
93
|
|
|
@@ -99,7 +99,7 @@ discard block |
|
|
block discarded – undo |
|
99
|
99
|
* @return boolean |
|
100
|
100
|
*/ |
|
101
|
101
|
private function _minimum_php_version_required() { |
|
102
|
|
- return $this->_check_php_version( EE_MIN_PHP_VER_REQUIRED ); |
|
|
102
|
+ return $this->_check_php_version(EE_MIN_PHP_VER_REQUIRED); |
|
103
|
103
|
} |
|
104
|
104
|
|
|
105
|
105
|
|
|
@@ -111,7 +111,7 @@ discard block |
|
|
block discarded – undo |
|
111
|
111
|
* @return boolean |
|
112
|
112
|
*/ |
|
113
|
113
|
private function _minimum_php_version_recommended() { |
|
114
|
|
- return $this->_check_php_version( EE_MIN_PHP_VER_RECOMMENDED ); |
|
|
114
|
+ return $this->_check_php_version(EE_MIN_PHP_VER_RECOMMENDED); |
|
115
|
115
|
} |
|
116
|
116
|
|
|
117
|
117
|
|
|
@@ -128,7 +128,7 @@ discard block |
|
|
block discarded – undo |
|
128
|
128
|
<p> |
|
129
|
129
|
<?php |
|
130
|
130
|
printf( |
|
131
|
|
- __( 'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso' ), |
|
|
131
|
+ __('We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso'), |
|
132
|
132
|
EE_MIN_WP_VER_REQUIRED, |
|
133
|
133
|
$wp_version, |
|
134
|
134
|
'<br/>', |
|
@@ -153,7 +153,7 @@ discard block |
|
|
block discarded – undo |
|
153
|
153
|
<p> |
|
154
|
154
|
<?php |
|
155
|
155
|
printf( |
|
156
|
|
- __( 'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso' ), |
|
|
156
|
+ __('We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso'), |
|
157
|
157
|
EE_MIN_PHP_VER_REQUIRED, |
|
158
|
158
|
PHP_VERSION, |
|
159
|
159
|
'<br/>', |
|
@@ -175,9 +175,9 @@ discard block |
|
|
block discarded – undo |
|
175
|
175
|
*/ |
|
176
|
176
|
private function _display_minimum_recommended_php_version_notice() { |
|
177
|
177
|
EE_Error::add_persistent_admin_notice( |
|
178
|
|
- 'php_version_' . str_replace( '.', '-', EE_MIN_PHP_VER_RECOMMENDED ) . '_recommended', |
|
|
178
|
+ 'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended', |
|
179
|
179
|
sprintf( |
|
180
|
|
- __( 'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso' ), |
|
|
180
|
+ __('Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso'), |
|
181
|
181
|
EE_MIN_PHP_VER_RECOMMENDED, |
|
182
|
182
|
PHP_VERSION, |
|
183
|
183
|
'<br/>', |
|
@@ -194,10 +194,10 @@ discard block |
|
|
block discarded – undo |
|
194
|
194
|
* @access private |
|
195
|
195
|
*/ |
|
196
|
196
|
private function _test_for_php_version_7() { |
|
197
|
|
- if ( $this->_check_php_version( '7' ) ) { |
|
198
|
|
- define( 'EE_PHP_7', true ); |
|
|
197
|
+ if ($this->_check_php_version('7')) { |
|
|
198
|
+ define('EE_PHP_7', true); |
|
199
|
199
|
} else { |
|
200
|
|
- define( 'EE_PHP_7', false ); |
|
|
200
|
+ define('EE_PHP_7', false); |
|
201
|
201
|
} |
|
202
|
202
|
} |
|
203
|
203
|
|