From b4682953a11f2a09bb5b64a0d672e8242b101497 Mon Sep 17 00:00:00 2001
From: stiofan <info@wpgeodirectory.com>
Date: Wed, 11 Jul 2018 09:25:57 +0100
Subject: [PATCH] Apple devices use different kind of apostrophe which does not
 work for search - FIXED

---
 change_log.txt                               | 4 ++++
 geodirectory-admin/admin_functions.php       | 3 ++-
 geodirectory-functions/custom_functions.php  | 4 +++-
 geodirectory-functions/general_functions.php | 1 +
 geodirectory-functions/listing_filters.php   | 1 +
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/change_log.txt b/change_log.txt
index 6f92d50..321b624 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,3 +1,7 @@
+v1.6.29
+iframe api generation broken (by Google iframe restrictions) changed to new window popup - FIXED
+Apple devices use different kind of apostrophe which does not work for search - FIXED
+
 v1.6.28
 OpenStreetMap populates wrong region for UK - FIXED
 Check added if post info missing on details page - FIXED
diff --git a/geodirectory-admin/admin_functions.php b/geodirectory-admin/admin_functions.php
index 36160aa..4507371 100644
--- a/geodirectory-admin/admin_functions.php
+++ b/geodirectory-admin/admin_functions.php
@@ -1034,7 +1034,8 @@ function geodir_admin_fields($options)
                                            } else {
                                                echo esc_attr($value['std']);
                                            } ?>"/>
-                    <a href='https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )','geodirectory');?>" ><?php _e('Generate API Key','geodirectory');?></a>
+                    <?php $gm_api_url = 'https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]';?>
+                    <a id="gd-api-key" onclick='window.open("<?php echo wp_slash($gm_api_url);?>", "newwindow", "width=600, height=400"); return false;' href='<?php echo $gm_api_url;?>' class="button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )','geodirectory');?>" ><?php _e('Generate API Key','geodirectory');?></a>
                     <span class="description"><?php echo $value['desc']; ?></span></td>
                 </tr><?php
                 break;
diff --git a/geodirectory-functions/custom_functions.php b/geodirectory-functions/custom_functions.php
index a24b7cf..641e0b0 100644
--- a/geodirectory-functions/custom_functions.php
+++ b/geodirectory-functions/custom_functions.php
@@ -2389,7 +2389,9 @@ function geodir_search_form_search_input() {
 	?>
 	<input class="search_text" name="s"
 	       value="<?php if ( isset( $_REQUEST['s'] ) && trim( $_REQUEST['s'] ) != '' ) {
-		       echo esc_attr( stripslashes_deep( $_REQUEST['s'] ) );
+		       $search_term = esc_attr( stripslashes_deep( $_REQUEST['s'] ) );
+		       $search_term = str_replace(array("%E2%80%99","’"),array("%27","'"),$search_term);
+		       echo $search_term;
 	       } else {
 		       echo $default_search_for_text;
 	       } ?>" type="text"
diff --git a/geodirectory-functions/general_functions.php b/geodirectory-functions/general_functions.php
index a578766..806cef0 100644
--- a/geodirectory-functions/general_functions.php
+++ b/geodirectory-functions/general_functions.php
@@ -4843,6 +4843,7 @@ function geodir_filter_title_variables( $title, $gd_page, $sep = '' ) {
 		$search_term = '';
 		if ( isset( $_REQUEST['s'] ) ) {
 			$search_term = esc_attr( $_REQUEST['s'] );
+			$search_term = str_replace(array("%E2%80%99","’"),array("%27","'"),$search_term);
 		}
 		$title = str_replace( "%%search_term%%", $search_term, $title );
 	}
diff --git a/geodirectory-functions/listing_filters.php b/geodirectory-functions/listing_filters.php
index 5034195..9fa5226 100644
--- a/geodirectory-functions/listing_filters.php
+++ b/geodirectory-functions/listing_filters.php
@@ -116,6 +116,7 @@ function set_listing_request($query )
 
         if (isset($_REQUEST['s'])) {
             $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s'])));
+            $s = str_replace(array("%E2%80%99","’"),array("%27","'"),$s);
         }
 
         if ($snear == 'NEAR ME') {