Merge branch 'develop'

osompress · Aug 20, 2020 · a73a14d · a73a14d
2 parents 97d3b71 + e41257b
commit a73a14d
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -18,7 +18,7 @@ commands:
     steps:
       - run:
           command: |
-            echo "export VERSION=$(git -C /tmp/src describe --tags --abbrev=0)" >> ${BASH_ENV}
+            echo "export VERSION=$(grep 'Version:' /tmp/src/plugin.php | awk -F: '{print $2}' | sed 's/^\s//')" >> ${BASH_ENV}
 
   show_pwd_info:
     description: "Show information about the current directory"

diff --git a/composer.lock b/composer.lock
diff --git a/genesis-portfolio-pro.php b/genesis-portfolio-pro.php
@@ -138,7 +138,7 @@ function genesis_portfolio_archive_setting_defaults( $defaults = array(), $post_
 
 register_activation_hook( __FILE__, 'genesis_portfolio_rewrite_flush' );
 /**
- * Activation hook action to flush the rewrit rules for the custom post type and taxonomy
+ * Activation hook action to flush the rewrite rules for the custom post type and taxonomy
  *
  * @since 0.1.0
  */

diff --git a/languages/genesis-portfolio-pro.pot b/languages/genesis-portfolio-pro.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Genesis Portfolio Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Genesis Portfolio Pro 1.2.2\n"
+"Project-Id-Version: Genesis Portfolio Pro 1.2.3\n"
 "Report-Msgid-Bugs-To: StudioPress <translations@studiopress.com>\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2020-04-15T16:59:10+00:00\n"
+"POT-Creation-Date: 2020-08-19T19:03:16+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.2.0\n"
 "X-Domain: genesis-portfolio-pro\n"

diff --git a/lib/views/widget/portfolio.php b/lib/views/widget/portfolio.php
@@ -77,7 +77,7 @@
 		if ( $image && $instance['show_image'] ) {
 			$state = empty( $instance['show_title'] ) ? '' : 'aria-hidden="true"';
 			// phpcs:ignore
-			printf( '<a href="%s" class="%s" %s>%s</a>', esc_url( get_permalink() ), esc_attr( $instance['image_alignment'] ), $state, wp_make_content_images_responsive( $image ) );
+			printf( '<a href="%s" class="%s" %s>%s</a>', esc_url( get_permalink() ), esc_attr( $instance['image_alignment'] ), $state, $image );
 		}
 
 		if ( $instance['show_title'] ) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "genesis-portfolio-pro",
   "main_plugin_file": "plugin",
   "title": "Genesis Portfolio Pro",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "license": "GPL-2.0-or-later",
   "licenseuri": "https://www.gnu.org/licenses/gpl-2.0.html",
   "description": "Plugin that add a new Portfolio post type where you can add portfolio entries with images and galleries to show off your visual content.",

diff --git a/plugin.php b/plugin.php
@@ -9,9 +9,11 @@
  * Plugin Name: Genesis Portfolio Pro
  * Plugin URI: https://wordpress.org/plugins/genesis-portfolio-pro/
  * Description: Adds default portfolio to any Genesis HTML5 theme.
- * Version: 1.2.2
+ * Version: 1.2.3
  * Author: StudioPress
  * Author URI: https://www.studiopress.com
+ * Requires at least: 4.4
+ * Requires PHP: 5.6
  * Text Domain: genesis-portfolio-pro
  * Domain Path: /languages
  */

diff --git a/readme.txt b/readme.txt
@@ -1,9 +1,10 @@
 === Genesis Portfolio Pro ===
-Contributors: nathanrice, studiopress, wpmuguru, nick_thegeek, bgardner, marksabbath, modernnerd
+Contributors: nathanrice, studiopress, wpmuguru, nick_thegeek, bgardner, marksabbath, modernnerd, dreamwhisper, wpengine
 Tags: genesis, portfolio, templates
 Requires at least: 4.4
-Tested up to: 5.4
-Stable tag: 1.2.2
+Tested up to: 5.5
+Requires PHP: 5.6
+Stable tag: 1.2.3
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -30,6 +31,9 @@ Custom templates are supported using the WordPress template hierarchy and the po
 
 == Changelog ==
 
+= 1.2.3 =
+* Removed use of `wp_make_content_images_responsive` portfolio widget images; `srcset` is applied via `wp_calculate_image_srcset` in `wp_get_attachment_image` used by `genesis_get_image`.
+
 = 1.2.2 =
 * REST: Expose the Portfolio post type and Portfolio Type taxonomy to the REST API.
 * Tooling: Generate language file with WP-CLI instead of Node.js.