Merge pull request #2616 from kprajapatii/master

2.3.58
AyeCode · Jun 20, 2024 · ffd0305 · ffd0305
2 parents 0fa91c2 + ef82131
commit ffd0305
Show file tree

Hide file tree

Showing 16 changed files with 198 additions and 179 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     }
   ],
   "require": {
-    "php": ">=5.4",
+    "php": ">=5.6",
     "ayecode/wp-font-awesome-settings": "^1",
     "ayecode/wp-super-duper": "^1.0",
     "ayecode/wp-deactivation-survey": "^1.0",

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.57
+ * Version: 2.3.58
  * 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.57';
+	public $version = '2.3.58';
 
 	/**
 	 * GeoDirectory instance.

diff --git a/includes/class-geodir-maps.php b/includes/class-geodir-maps.php
@@ -96,7 +96,7 @@ public static function get_marker_size( $icon, $default_size = array( 'w' => 36,
 
 		$sizes = array();
 		if ( is_file( $icon ) && file_exists( $icon ) ) {
-			$size = getimagesize( trim( $icon ) );
+			$size = function_exists( 'wp_getimagesize' ) ? wp_getimagesize( trim( $icon ) ) : @getimagesize( trim( $icon ) );
 
 			// Check for .svg image
 			if ( empty( $size ) && preg_match( '/\.svg$/i', $icon ) ) {

diff --git a/includes/class-geodir-media.php b/includes/class-geodir-media.php
@@ -168,7 +168,7 @@ public static function create_image_sizes( $file, $attachment_id = 0 ) {
 		}
 
 		$metadata = array();
-		$imagesize = getimagesize( $file );
+		$imagesize = function_exists( 'wp_getimagesize' ) ? wp_getimagesize( $file ) : @getimagesize( $file );
 		$metadata['width'] = $imagesize[0];
 		$metadata['height'] = $imagesize[1];
 

diff --git a/includes/image-functions.php b/includes/image-functions.php
@@ -644,7 +644,7 @@ function geodir_get_image_dimension( $image_url, $default = array() ) {
 
 	$dimension = array();
 	if ( is_file( $image_url ) && file_exists( $image_url ) ) {
-		$size = @getimagesize( trim( $image_url ) );
+		$size = function_exists( 'wp_getimagesize' ) ? wp_getimagesize( trim( $image_url ) ) : @getimagesize( trim( $image_url ) );
 
 		// Check for .svg image
 		if ( empty( $size ) && preg_match( '/\.svg$/i', $image_url ) ) {

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