Merge branch 'release/v1.2.16'

wink-travel · May 16, 2022 · f987448 · f987448
2 parents 73c25fa + 6e19ece
commit f987448
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,32 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.16] - 2022-05-16
+
+### Bug Fixes
+
+- :bug: fixed local development
+
+### Styling
+
+- :lipstick: added square brand icon
+
+### Build
+
+- :construction_worker: bumped version
+- :construction_worker: disabled sslverify in dev env for layout call
+- Bookmark: merge to master
+- :construction_worker: bumped version numbers
+- :construction_worker: changed git cliff tag name to fit the actual tag
+- Bookmark: merge to master
+- :construction_worker: bumped version number everywhere
+- Bookmark: merge to master
+- :construction_worker: bumped correct version number in ikotravel.php
+- Bookmark: merge to master
+- Bookmark: merge to master
+- Bookmark: merge to master
+- :construction_worker: bumped version number correctly
+
 ## [1.2.15] - 2022-05-16
 
 ### Bug Fixes

diff --git a/README.txt b/README.txt
@@ -3,8 +3,8 @@ Contributors: MB-Jan, ikotravel
 Tags: travel, iko, booking
 Requires at least: 4.7
 Tested up to: 6.0
-Stable tag: 1.2.15
-Version: 1.2.15
+Stable tag: 1.2.16
+Version: 1.2.16
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -49,6 +49,9 @@ If you notice any issues, please contact us.
 
 == Changelog ==
 
+= 1.2.16 =
+* Disabled sslverify in development environment.
+
 = 1.2.15 =
 * Build related.
 

diff --git a/ikoTravel.php b/ikoTravel.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name: iko.travel Affiliate
  * Description: This plugin integrates your iko.travel affiliate account with WordPress. It integrates with Gutenberg, Elementor, Avada, WPBakery and as shortcodes.
- * Version:     1.2.15
+ * Version:     1.2.16
  * Author:      iko.travel
  * Author URI:  https://iko.travel/
  * License:     GPL-3.0

diff --git a/includes/elements/ikocontent.php b/includes/elements/ikocontent.php
@@ -144,7 +144,7 @@ function getIkoBearerToken()
                 'redirection' => 10,
                 'httpversion' => '1.0',
                 'blocking'    => true,
-                'sslverify' => false,
+                'sslverify' => true,
             );
             if ($this->environmentVal == 'development') {
                 error_log('iko.travel - Development environment. Ignoring self-signed certificates');
@@ -207,6 +207,10 @@ function getIkoLayouts($bearerToken) {
                     'Authorization' => 'Bearer '.$bearerToken
                 )
             );
+            if ($this->environmentVal == 'development') {
+                error_log('iko.travel - Development environment. Ignoring self-signed certificates');
+                $getArgs['sslverify'] = false; 
+            }
             $response = wp_remote_get($url,$getArgs);
             if ( is_wp_error( $response ) ) {
                 // print out any error