Merge pull request #2523 from kprajapatii/master

2.3.37

geodirectory.php

@@ -11,7 +11,7 @@
  * Plugin Name: GeoDirectory
  * Plugin URI: https://wpgeodirectory.com/
  * Description: GeoDirectory - Business Directory Plugin for WordPress.
- * Version: 2.3.36
+ * Version: 2.3.37
  * Author: AyeCode - WordPress Business Directory Plugins
  * Author URI: https://wpgeodirectory.com
  * Text Domain: geodirectory
@@ -34,7 +34,7 @@ final class GeoDirectory {
 	 *
 	 * @var string
 	 */
-	public $version = '2.3.36';
+	public $version = '2.3.37';
 
 	/**
 	 * GeoDirectory instance.

includes/class-geodir-compatibility.php

@@ -2091,7 +2091,7 @@ public static function template_redirect() {
 		}
 
 		// Borlabs Cookie Integration
-		if ( defined( 'BORLABS_COOKIE_VERSION' ) &&  ! is_admin() && geodir_get_option( 'borlabs_cookie' ) ) {
+		if ( defined( 'BORLABS_COOKIE_VERSION' ) && version_compare( BORLABS_COOKIE_VERSION, '3.0', '<' ) &&  ! is_admin() && geodir_get_option( 'borlabs_cookie' ) ) {
 			add_filter( 'geodir_lazy_load_map', array( __CLASS__, 'borlabs_cookie_setup' ), 999, 1 );
 			add_filter( 'wp_super_duper_widget_output', array( __CLASS__, 'borlabs_cookie_wrap' ), 999, 4 );
 		}
@@ -4038,7 +4038,7 @@ public static function borlabs_cookie_setting( $settings ) {
 			$_settings[] = $setting;
 
 			if ( ! empty( $setting['id'] ) && $setting['id'] == 'map_cache' ) {
-				$_settings[] = array(
+				$_setting = array(
 					'name' => __( 'Borlabs Cookie Integration', 'geodirectory'),
 					'desc' => __( 'Enable Borlabs Cookie integration for GeoDirectory maps.', 'geodirectory' ),
 					'id' => 'borlabs_cookie',
@@ -4047,6 +4047,14 @@ public static function borlabs_cookie_setting( $settings ) {
 					'desc_tip' => false,
 					'advanced' => true
 				);
+
+				if ( defined( 'BORLABS_COOKIE_VERSION' ) && version_compare( BORLABS_COOKIE_VERSION, '3.0', '>=' ) ) {
+					$_setting['desc'] = __( 'NOTE: Go to Borlabs Cookie > Settings to enable Borlabs Cookie integration for GeoDirectory maps.', 'geodirectory' );
+					$_setting['custom_attributes'] = array(
+						'disabled' => 'disabled'
+					);
+				}
+				$_settings[] = $_setting;
 			}
 		}