Merge pull request #947 from cloudinary/hotfix/3.1.8-build-2

Hotfix/3.1.8 build 2

Author: pereirinha

php/connect/class-api.php

@@ -455,7 +455,7 @@ public function upload_large( $attachment_id, $args ) {
 			if ( is_wp_error( $result ) ) {
 				break;
 			}
-			$index ++;
+			++$index;
 		}
 		fclose( $src ); //phpcs:ignore
 		unlink( $temp_file_name ); //phpcs:ignore
@@ -464,7 +464,6 @@ public function upload_large( $attachment_id, $args ) {
 		}
 
 		return $result;
-
 	}
 
 	/**
@@ -505,7 +504,20 @@ public function upload( $attachment_id, $args, $headers = array(), $try_remote =
 		$args                = $this->clean_args( $args );
 		$disable_https_fetch = get_transient( '_cld_disable_http_upload' );
 
-		if ( function_exists( 'wp_get_original_image_url' ) && wp_attachment_is_image( $attachment_id ) ) {
+		/**
+		 * Whether to use the original image URL.
+		 *
+		 * @hook    cloudinary_use_original_image
+		 * @since   3.1.8
+		 * @default true
+		 *
+		 * @param $use_original  {bool} The default value.
+		 * @param $attachment_id {int}  The attachment ID.
+		 *
+		 * @return  {bool}
+		 */
+		$use_original = apply_filters( 'cloudinary_use_original_image', true, $attachment_id );
+		if ( $use_original && function_exists( 'wp_get_original_image_url' ) && wp_attachment_is_image( $attachment_id ) ) {
 			$file_url = wp_get_original_image_url( $attachment_id );
 		} else {
 			$file_url = wp_get_attachment_url( $attachment_id );
@@ -535,7 +547,7 @@ public function upload( $attachment_id, $args, $headers = array(), $try_remote =
 			// We should have the file in args at this point, but if the transient was set, it will be defaulting here.
 			if ( empty( $args['file'] ) ) {
 				if ( wp_attachment_is_image( $attachment_id ) ) {
-					$get_path_func = function_exists( 'wp_get_original_image_path' ) ? 'wp_get_original_image_path' : 'get_attached_file';
+					$get_path_func = $use_original && function_exists( 'wp_get_original_image_path' ) ? 'wp_get_original_image_path' : 'get_attached_file';
 					$args['file']  = call_user_func( $get_path_func, $attachment_id );
 				} else {
 					$args['file'] = get_attached_file( $attachment_id );
@@ -898,7 +910,7 @@ public function get_public_id( $attachment_id, $args = array(), $original_public
 			)
 		) {
 
-			$parts   = explode( '/', $public_id );
+			$parts    = explode( '/', $public_id );
 			$filename = end( $parts );
 
 			/**
@@ -1010,5 +1022,4 @@ private function call( $url, $args = array(), $method = 'get' ) {
 
 		return $result;
 	}
-
 }

php/media/class-gallery.php

@@ -13,6 +13,7 @@
 use Cloudinary\REST_API;
 use Cloudinary\Settings_Component;
 use Cloudinary\Utils;
+use WP_Screen;
 
 /**
  * Class Gallery.
@@ -114,6 +115,11 @@ public function __construct( Plugin $plugin ) {
 	 * @return array
 	 */
 	public function get_config() {
+		$screen = null;
+
+		if ( function_exists( 'get_current_screen' ) ) {
+			$screen = get_current_screen();
+		}
 
 		$config = ! empty( $this->settings->get_value( 'gallery_config' ) ) ?
 			$this->settings->get_value( 'gallery_config' ) :
@@ -133,7 +139,11 @@ public function get_config() {
 
 		$credentials = $this->plugin->components['connect']->get_credentials();
 
-		if ( ! empty( $credentials['cname'] ) ) {
+		// Do not use privateCdn and secureDistribution on gallery settings page.
+		if (
+			! empty( $credentials['cname'] )
+			&& ( ! $screen instanceof WP_Screen || 'cloudinary_page_cloudinary_gallery' !== $screen->id )
+		) {
 			$config['secureDistribution'] = $credentials['cname'];
 			$config['privateCdn']         = true;
 		}

ui-definitions/settings-pages.php

@@ -225,7 +225,7 @@
 		'sidebar'    => true,
 		array(
 			'type'  => 'panel',
-			'title' => __( 'Help Centre', 'cloudinary' ),
+			'title' => __( 'Help Center', 'cloudinary' ),
 			array(
 				'type'    => 'tag',
 				'element' => 'h4',