Merge pull request #2707 from kprajapatii/master

2.3.83
AyeCode · Oct 24, 2024 · e0e8208 · e0e8208
2 parents 4b9ba1a + b7ff80b
commit e0e8208
Show file tree

Hide file tree

Showing 9 changed files with 113 additions and 99 deletions.
diff --git a/geodirectory.php b/geodirectory.php
@@ -11,7 +11,7 @@
  * Plugin Name: GeoDirectory
  * Plugin URI: https://wpgeodirectory.com/
  * Description: GeoDirectory - Business Directory Plugin for WordPress.
- * Version: 2.3.82
+ * Version: 2.3.83
  * Author: AyeCode - WP Business Directory Plugins
  * Author URI: https://wpgeodirectory.com
  * Text Domain: geodirectory
@@ -34,7 +34,7 @@ final class GeoDirectory {
 		 *
 		 * @var string
 		 */
-		public $version = '2.3.82';
+		public $version = '2.3.83';
 
 		/**
 		 * GeoDirectory instance.

diff --git a/includes/custom-fields/input-functions-aui.php b/includes/custom-fields/input-functions-aui.php
@@ -1394,8 +1394,13 @@ function geodir_cfi_address( $html, $cf ) {
             $lat_lng_blank = true;
         }
 
-        if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';
-        if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';
+        if ( empty( $lat ) ) {
+            $lat = ! empty( $location->latitude ) ? $location->latitude : ( isset( $location->city_latitude ) ? $location->city_latitude : '' );
+        }
+
+        if ( empty( $lng ) ) {
+            $lng = ! empty( $location->longitude ) ? $location->longitude : ( isset( $location->city_longitude ) ? $location->city_longitude : '' );
+        }
 
         /**
          * Filter the default latitude.

diff --git a/includes/custom-fields/input-functions.php b/includes/custom-fields/input-functions.php
@@ -1152,8 +1152,13 @@ function geodir_cfi_address( $html, $cf ) {
             $lat_lng_blank = true;
         }
 
-        if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';
-        if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';
+        if ( empty( $lat ) ) {
+            $lat = ! empty( $location->latitude ) ? $location->latitude : ( isset( $location->city_latitude ) ? $location->city_latitude : '' );
+        }
+
+        if ( empty( $lng ) ) {
+            $lng = ! empty( $location->longitude ) ? $location->longitude : ( isset( $location->city_longitude ) ? $location->city_longitude : '' );
+        }
 
         /**
          * Filter the default latitude.

diff --git a/includes/widgets/class-geodir-widget-categories.php b/includes/widgets/class-geodir-widget-categories.php
@@ -1060,6 +1060,8 @@ public static function categories_output( $params ) {
 					}
 
 					foreach ( $categories as $category ) {
+						$args['parent_term'] = $category;
+
 						$term_icon = '';
 						$cat_color = '';
 
@@ -1373,6 +1375,8 @@ public static function child_cats( $parent_id, $cpt, $hide_empty, $hide_count, $
 
 		$depth++;
 		foreach ( $child_cats as $category ) {
+			$args['child_term'] = $category;
+
 			$term_icon_url = ! empty( $term_icons ) && isset( $term_icons[ $category->term_id ] ) ? $term_icons[ $category->term_id ] : '';
 			$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr( $category->name ) . ' icon" src="' . $term_icon_url . '" class=""/> ' : '';
 			$cat_font_icon = get_term_meta( $category->term_id, 'ct_cat_font_icon', true );

diff --git a/languages/geodirectory-en_US.mo b/languages/geodirectory-en_US.mo