Merge pull request #946 from cloudinary/hotfix/3.1.8-build-1

Hotfix `3.1.8-build-1`

Author: pereirinha

css/images/academy.svg renamed to css/images/academy-icon.svg

@@ -1259,7 +1259,7 @@ public function settings( $pages ) {
 					),
 					array(
 						'type'  => 'info_box',
-						'icon'  => $this->plugin->dir_url . 'css/images/academy.svg',
+						'icon'  => $this->plugin->dir_url . 'css/images/academy-icon.svg',
 						'title' => __( 'Need help?', 'cloudinary' ),
 						'text'  => sprintf(
 							// Translators: The HTML for opening and closing link tags.

php/class-sync.php

@@ -223,7 +223,7 @@ public static function user_can( $task, $capability = 'manage_options', $context
 		 * @default 'manage_options'
 		 * @return  {string}
 		 */
-		$capability = apply_filters( "cloudinary_task_capability_{$task}", $capability, $context, $args );
+		$capability = apply_filters( "cloudinary_task_capability_{$task}", $capability, $context, ...$args );
 
 		/**
 		 * Filter the capability required for Cloudinary tasks.
@@ -254,10 +254,10 @@ public static function user_can( $task, $capability = 'manage_options', $context
 		 *
 		 * @return  {string}
 		 */
-		$capability = apply_filters( 'cloudinary_task_capability', $capability, $task, $context, $args );
+		$capability = apply_filters( 'cloudinary_task_capability', $capability, $task, $context, ...$args );
 		// phpcs:enable WordPress.WhiteSpace.DisallowInlineTabs.NonIndentTabsUsed
 
-		return current_user_can( $capability, $args );
+		return current_user_can( $capability, ...$args );
 	}
 
 	/**

php/class-utils.php

@@ -534,7 +534,7 @@ public function register_settings( $pages ) {
 					),
 					array(
 						'type'  => 'info_box',
-						'icon'  => $this->plugin->dir_url . 'css/images/academy.svg',
+						'icon'  => $this->plugin->dir_url . 'css/images/academy-icon.svg',
 						'title' => __( 'Need help?', 'cloudinary' ),
 						'text'  => sprintf(
 							// Translators: The HTML for opening and closing link tags.

php/delivery/class-lazy-load.php

@@ -402,7 +402,7 @@ public function register_settings( $pages ) {
 
 		$panel[] = array(
 			'type'  => 'info_box',
-			'icon'  => $this->plugin->dir_url . 'css/images/academy.svg',
+			'icon'  => $this->plugin->dir_url . 'css/images/academy-icon.svg',
 			'title' => __( 'Need help?', 'cloudinary' ),
 			'text'  => sprintf(
 				// Translators: The HTML for opening and closing link tags.

php/media/class-gallery.php

@@ -242,7 +242,7 @@
 		),
 		array(
 			'type'  => 'info_box',
-			'icon'  => $this->dir_url . 'css/images/academy.svg',
+			'icon'  => $this->dir_url . 'css/images/academy-icon.svg',
 			'title' => __( 'Need help?', 'cloudinary' ),
 			'text'  => sprintf(
 				// Translators: The HTML for opening and closing link tags.

ui-definitions/settings-image.php

@@ -202,7 +202,7 @@
 				),
 				array(
 					'type'  => 'info_box',
-					'icon'  => $this->dir_url . 'css/images/academy.svg',
+					'icon'  => $this->dir_url . 'css/images/academy-icon.svg',
 					'title' => __( 'Need help?', 'cloudinary' ),
 					'text'  => sprintf(
 						// Translators: The HTML for opening and closing link tags.
@@ -284,7 +284,6 @@
 				),
 				array(
 					'type'                => 'column',
-					'requires_connection' => true,
 					'attributes'          => array(
 						'wrap' => array(
 							'class' => array(

ui-definitions/settings-pages.php

@@ -289,7 +289,7 @@
 		),
 		array(
 			'type'  => 'info_box',
-			'icon'  => $this->dir_url . 'css/images/academy.svg',
+			'icon'  => $this->dir_url . 'css/images/academy-icon.svg',
 			'title' => __( 'Need help?', 'cloudinary' ),
 			'text'  => sprintf(
 				// Translators: The HTML for opening and closing link tags.