@@ -56,15 +56,15 @@ private function verify_dependencies() {
5656
5757 $ error = null ;
5858
59- if ( version_compare ( phpversion (), self ::$ settings ['deps ' ]['php ' ], '< ' ) ) {
59+ if ( $ this -> is_php_version ( self ::$ settings ['deps ' ]['php ' ], '< ' ) ) {
6060 $ error = '<strong> ' . self ::$ settings ['data ' ]['Name ' ] . ':</strong> ' . __ ('This plugin is not supported on versions of PHP under ' . ' ' . self ::$ settings ['deps ' ]['php ' ] . '. ' );
6161 } else if (!defined ('\\Carbon_Fields \\VERSION ' )) {
6262 $ error = '<strong> ' . self ::$ settings ['data ' ]['Name ' ] . ':</strong> ' . __ ('A fatal error occurred while trying to load dependencies. ' );
6363 } else if ( version_compare ( \Carbon_Fields \VERSION , self ::$ settings ['deps ' ]['carbon_fields ' ], '< ' ) ) {
6464 $ error = '<strong> ' . self ::$ settings ['data ' ]['Name ' ] . ':</strong> ' . __ ('Unable to load. An outdated version of Carbon Fields has been loaded: ' . ' ' . \Carbon_Fields \VERSION ) . ' (>= ' .self ::$ settings ['deps ' ]['carbon_fields ' ] . ' ' . __ ('required ' ) . ') ' ;
6565 }
6666
67- if ($ error ) Helpers ::show_notice ($ error , 'error ' , false );
67+ if ($ error ) Utils ::show_notice ($ error , 'error ' , false );
6868 return !$ error ;
6969
7070 }
@@ -78,12 +78,13 @@ public function get_plugin_option( $key, $cache = true, $source = null ) {
7878
7979 if ( $ cache ) {
8080 // Attempt to get value from cache, else return value from database
81- return Cache::get_object ( self ::$ prefix . $ key , function () use (&$ key , &$ source ) {
82- return carbon_get_theme_option ( self ::$ prefix .$ key );
81+ $ prefix = self ::$ prefix ; // For PHP 5.3 compatibility
82+ return Cache::get_object ( self ::$ prefix . $ key , function () use (&$ key , &$ source , &$ prefix ) {
83+ return carbon_get_theme_option ( $ prefix .$ key );
8384 });
8485 } else {
8586 // Return uncached value
86- return carbon_get_theme_option ( self :: $ prefix .$ key );
87+ return carbon_get_theme_option ( $ prefix .$ key );
8788 }
8889
8990 }
@@ -96,7 +97,7 @@ public function get_plugin_option( $key, $cache = true, $source = null ) {
9697 * @return bool
9798 */
9899 public function is_production () {
99- return ( !defined ('WP_ENV ' ) || (defined ('WP_ENV ' ) && !in_array (WP_ENV , [ 'development ' , 'staging ' ] ) ) );
100+ return ( !defined ( 'WP_ENV ' ) || ( defined ('WP_ENV ' ) && !in_array ( WP_ENV , array ( 'development ' , 'staging ' ) ) ) );
100101 }
101102
102103 /**
@@ -108,6 +109,15 @@ public function is_ajax() {
108109 return defined ('DOING_AJAX ' ) && DOING_AJAX ;
109110 }
110111
112+ /**
113+ * Wrapper for phpversion() and version_compare()
114+ *
115+ * @return bool
116+ */
117+ public function is_php_version ( $ version = '5.3 ' , $ operator = '>= ' ) {
118+ return version_compare ( phpversion (), $ version , $ operator );
119+ }
120+
111121 /**
112122 * Returns script ?ver= version based on environment (WP_ENV)
113123 *
0 commit comments