Merge branch 'develop' into uat

cloudinary · Nov 19, 2024 · c897b7a · c897b7a
2 parents 626e396 + 31bf160
commit c897b7a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/php/class-media.php b/php/class-media.php
@@ -356,22 +356,16 @@ public function maybe_file_exist_in_url( $url ) {
 		if ( ! filter_var( $url, FILTER_VALIDATE_URL ) ) {
 			return false;
 		}
-		// phpcs:disable WordPress.WP.AlternativeFunctions
-		$ch = curl_init( $url );
-		curl_setopt( $ch, CURLOPT_NOBODY, true );
-		curl_exec( $ch );
-		$code = curl_getinfo( $ch, CURLINFO_HTTP_CODE );
-
-		if ( 200 === $code ) {
-			$status = true;
-		} else {
-			$status = false;
+
+		$head = wp_safe_remote_head( $url );
+
+		if ( is_wp_error( $head ) ) {
+			return false;
 		}
 
-		curl_close( $ch );
-		// phpcs:enable
+		$code = wp_remote_retrieve_response_code( $head );
 
-		return $status;
+		return 200 === $code;
 	}
 
 	/**

diff --git a/php/relate/class-relationship.php b/php/relate/class-relationship.php
@@ -160,11 +160,17 @@ public function flush_cache() {
 	 * @param array $post_ids The post ids.
 	 */
 	public static function preload( $post_ids ) {
+		// Check if the post_ids are objects.
+		$maybe_ids = array_column( $post_ids, 'ID' );
+		if ( ! empty( $maybe_ids ) ) {
+			// If so, make sure to just use the IDs.
+			$post_ids = $maybe_ids;
+		}
 		global $wpdb;
 		$table_name = Utils::get_relationship_table();
 		// Do the public_ids.
 		$list  = implode( ', ', array_fill( 0, count( $post_ids ), '%d' ) );
-		$where = "post_id IN( {$list} )";
+		$where = "post_id IN ( {$list} )";
 
 		$sql   = $wpdb->prepare( "SELECT * FROM {$table_name} WHERE {$where}", $post_ids ); // phpcs:ignore WordPress.DB
 		$posts = $wpdb->get_results( $sql, ARRAY_A ); // phpcs:ignore WordPress.DB

diff --git a/php/sync/class-sync-queue.php b/php/sync/class-sync-queue.php
@@ -394,18 +394,18 @@ public function get_total_synced_media() {
 		$return = array(
 			// Original sizes.
 			'original_size'           => $total_local_size,
-			'original_size_percent'   => '100%', // The original will always be 100%, as it's the comparison to optimized.
+			'original_size_percent'   => 0 !== $total_assets ? '100%' : '0%', // The original will always be 100%, as it's the comparison to optimized.
 			'original_size_hr'        => size_format( $total_local_size ),
 
 			// Optimized size. We use the `original_size` to determine the percentage between for the progress bar.
 			'optimized_size'          => $total_remote_size,
-			'optimized_size_percent'  => round( abs( $total_remote_size ) / abs( $total_local_size ) * 100 ) . '%', // This is the percentage difference.
-			'optimized_diff_percent'  => round( ( $total_local_size - $total_remote_size ) / $total_local_size * 100 ) . '%', // We use this for the "Size saved.." status text.
+			'optimized_size_percent'  => $total_local_size > 0 ? round( abs( $total_remote_size ) / abs( $total_local_size ) * 100 ) . '%' : '0%', // This is the percentage difference.
+			'optimized_diff_percent'  => $total_local_size > 0 ? round( ( $total_local_size - $total_remote_size ) / $total_local_size * 100 ) . '%' : '0%', // We use this for the "Size saved.." status text.
 			'optimized_size_hr'       => size_format( $total_remote_size ), // This is the formatted byte size.
 
 			// Optimized is the % optimized vs unoptimized.
-			'optimized_percent'       => round( $total_optimized / $total_assets, 4 ),
-			'optimized_percent_hr'    => round( $total_optimized / $total_assets * 100, 1 ) . '%',
+			'optimized_percent'       => $total_assets > 0 ? round( $total_optimized / $total_assets, 4 ) : 0,
+			'optimized_percent_hr'    => $total_assets > 0 ? round( $total_optimized / $total_assets * 100, 1 ) . '%' : '0%',
 			'optimized_info'          => __( 'Optimized assets', 'cloudinary' ),
 
 			// Error size: No mockups on what to display here.