← All changes | cbxgooglemap.php +19 -43 trunk → 2.0.2 View file →

		@@ -15,9 +15,9 @@
15	15	* @wordpress-plugin
16	16	* Plugin Name: CBX Map for Google Map & OpenStreetMap
17	17	* Plugin URI: https://codeboxr.com/product/cbx-google-map-for-wordpress/
18	18	* Description: Easy responsive embed of google map and openstreet map
19		- * Version: 2.0.5
	19	+ * Version: 2.0.2
20	20	* Author: Codeboxr
21	21	* Author URI: https://codeboxr.com
22	22	* License: GPL-2.0+
23	23	* License URI: http://www.gnu.org/licenses/gpl-2.0.txt
		@@ -32,9 +32,9 @@
32	32	die;
33	33	}
34	34
35	35	defined( 'CBXGOOGLEMAP_PLUGIN_NAME' ) or define( 'CBXGOOGLEMAP_PLUGIN_NAME', 'cbxgooglemap' );
36		-defined( 'CBXGOOGLEMAP_PLUGIN_VERSION' ) or define( 'CBXGOOGLEMAP_PLUGIN_VERSION', '2.0.5' );
	36	+defined( 'CBXGOOGLEMAP_PLUGIN_VERSION' ) or define( 'CBXGOOGLEMAP_PLUGIN_VERSION', '2.0.2' );
37	37	defined( 'CBXGOOGLEMAP_BASE_NAME' ) or define( 'CBXGOOGLEMAP_BASE_NAME', plugin_basename( __FILE__ ) );
38	38	defined( 'CBXGOOGLEMAP_ROOT_PATH' ) or define( 'CBXGOOGLEMAP_ROOT_PATH', plugin_dir_path( __FILE__ ) );
39	39	defined( 'CBXGOOGLEMAP_ROOT_URL' ) or define( 'CBXGOOGLEMAP_ROOT_URL', plugin_dir_url( __FILE__ ) );
40	40
		@@ -39,9 +39,8 @@
39	39	defined( 'CBXGOOGLEMAP_ROOT_URL' ) or define( 'CBXGOOGLEMAP_ROOT_URL', plugin_dir_url( __FILE__ ) );
40	40
41	41	defined( 'CBXGOOGLEMAP_WP_MIN_VERSION' ) or define( 'CBXGOOGLEMAP_WP_MIN_VERSION', '5.3' );
42	42	defined( 'CBXGOOGLEMAP_PHP_MIN_VERSION' ) or define( 'CBXGOOGLEMAP_PHP_MIN_VERSION', '7.4' );
43		-defined( 'CBXGOOGLEMAP_PRO_VERSION' ) or define( 'CBXGOOGLEMAP_PRO_VERSION', '2.0.5' );
44	43
45	44	// Include the main class
46	45	if ( ! class_exists( 'CBXGoogleMap', false ) ) {
47	46	include_once CBXGOOGLEMAP_ROOT_PATH . 'includes/CBXGoogleMap.php';
		@@ -90,55 +89,32 @@
90	89	* The code that runs during plugin activation.
91	90	* This action is documented in includes/class-cbxgooglemap-activator.php
92	91	*/
93	92	function cbxgooglemap_activate() {
94		- try {
95		- $wp_version = CBXGOOGLEMAP_WP_MIN_VERSION;
96		- $php_version = CBXGOOGLEMAP_PHP_MIN_VERSION;
	93	+ $wp_version = CBXGOOGLEMAP_WP_MIN_VERSION;
	94	+ $php_version = CBXGOOGLEMAP_PHP_MIN_VERSION;
97	95
98		- $activate_ok = true;
99		- if ( ! cbxgooglemap_compatible_wp_version() ) {
100		- $activate_ok = false;
101		- deactivate_plugins( plugin_basename( __FILE__ ) );
	96	+ $activate_ok = true;
	97	+ if ( ! cbxgooglemap_compatible_wp_version() ) {
	98	+ $activate_ok = false;
	99	+ deactivate_plugins( plugin_basename( __FILE__ ) );
102	100
103		- /* translators: WordPress version */
104		- wp_die( sprintf( esc_html__( 'CBX Google Map plugin requires WordPress %s or higher!', 'cbxgooglemap' ), esc_attr($wp_version) ) ); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
105		- }
106		-
107		- if ( ! cbxgooglemap_compatible_php_version() ) {
108		- $activate_ok = false;
109		- deactivate_plugins( plugin_basename( __FILE__ ) );
110		-
111		- /* translators: PHP version */
112		- wp_die( sprintf( esc_html__( 'CBX Google Map plugin requires PHP %s or higher!', 'cbxgooglemap' ), esc_attr($php_version) ) ); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
113		- }
114		-
115		- if($activate_ok) {
116		- cbxgooglemap_core();
117		- CBXGooglemapHelper::activate();
118		- }
	101	+ /* translators: WordPress version */
	102	+ wp_die( sprintf( esc_html__( 'CBX Google Map plugin requires WordPress %s or higher!', 'cbxgooglemap' ), esc_attr($wp_version) ) ); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
119	103	}
120		- catch ( Throwable $e ) {
121		- if ( defined( 'WP_DEBUG' ) && WP_DEBUG && defined( 'WP_DEBUG_LOG' ) && WP_DEBUG_LOG ) {
122		- //phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log, WordPress.PHP.DevelopmentFunctions.error_log_print_r
123		- error_log( print_r( [
124		- 'message' => $e->getMessage(),
125		- 'file' => $e->getFile(),
126		- 'line' => $e->getLine(),
127		- 'trace' => $e->getTraceAsString(),
128		- ], true ) );
129		- }
130	104
131		-
	105	+ if ( ! cbxgooglemap_compatible_php_version() ) {
	106	+ $activate_ok = false;
132	107	deactivate_plugins( plugin_basename( __FILE__ ) );
133	108
134		- wp_die(
135		- sprintf(
136		- 'Activation error: %s',
137		- esc_html( $e->getMessage() )
138		- )
139		- );
	109	+ /* translators: PHP version */
	110	+ wp_die( sprintf( esc_html__( 'CBX Google Map plugin requires PHP %s or higher!', 'cbxgooglemap' ), esc_attr($php_version) ) ); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
140	111	}
	112	+
	113	+ if($activate_ok) {
	114	+ cbxgooglemap_core();
	115	+ CBXGooglemapHelper::activate();
	116	+ }
141	117	}//end method cbxgooglemap_activate
142	118
143	119	/**
144	120	* The code that runs during plugin deactivation.