Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 1.3.16 #866

Merged
merged 5 commits into from
Dec 13, 2023
Merged

Release 1.3.16 #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
677b667
Check feed_location to contain absolute url.
message-dimke Nov 10, 2023
0514316
Merge pull request #862 from woocommerce/trunk
ibndawood Nov 28, 2023
dfb0f5d
Merge pull request #847 from woocommerce/fix/feed-location-absolute-url
message-dimke Dec 9, 2023
721565d
Product version bump update
budzanowski Dec 13, 2023
28f1558
Changelog update
budzanowski Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
*** Pinterest for WooCommerce Changelog ***

= 1.3.16 - 2023-12-13 =
* Tweak - Make sure `feed_location` has a full URL.

= 1.3.15 - 2023-11-28 =
* Add - Compatibility with the Cart and Checkout blocks.

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "pinterest-for-woocommerce",
"title": "Pinterest for WooCommerce",
"description": "Pinterest for WooCommerce",
"version": "1.3.15",
"version": "1.3.16",
"main": "gulpfile.js",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions pinterest-for-woocommerce.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* Plugin Name: Pinterest for WooCommerce
* Plugin URI: https://woo.com/products/pinterest-for-woocommerce/
* Description: Grow your business on Pinterest! Use this official plugin to allow shoppers to Pin products while browsing your store, track conversions, and advertise on Pinterest.
* Version: 1.3.15
* Version: 1.3.16
* Author: WooCommerce
* Author URI: https://woo.com
* License: GPL-2.0+
Expand Down Expand Up @@ -46,7 +46,7 @@
}

define( 'PINTEREST_FOR_WOOCOMMERCE_PLUGIN_FILE', __FILE__ );
define( 'PINTEREST_FOR_WOOCOMMERCE_VERSION', '1.3.15' ); // WRCS: DEFINED_VERSION.
define( 'PINTEREST_FOR_WOOCOMMERCE_VERSION', '1.3.16' ); // WRCS: DEFINED_VERSION.

// HPOS compatibility declaration.
add_action(
Expand Down
5 changes: 4 additions & 1 deletion readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Tags: woocommerce, pinterest, advertise
Requires at least: 5.6
Tested up to: 6.4
Requires PHP: 7.3
Stable tag: 1.3.15
Stable tag: 1.3.16
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -91,6 +91,9 @@ Release and roadmap notes available on the [WooCommerce Developers Blog](hhttps:

== Changelog ==

= 1.3.16 - 2023-12-13 =
* Tweak - Make sure `feed_location` has a full URL.

= 1.3.15 - 2023-11-28 =
* Add - Compatibility with the Cart and Checkout blocks.

Expand Down
6 changes: 5 additions & 1 deletion src/Merchants.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,13 @@ public static function update_or_create_merchant() {
*/
$merchant_name = apply_filters( 'pinterest_for_woocommerce_default_merchant_name', esc_html__( 'Auto-created by Pinterest for WooCommerce', 'pinterest-for-woocommerce' ) );

// Check if the feed location is a full URL or a relative path and build the feed location accordingly.
$feed_location = parse_url( $config['feed_url'] );
$feed_location = ! empty( $feed_location['host'] ) ? $config['feed_url'] : get_home_url() . $feed_location['path'];

$args = array(
'merchant_domains' => get_home_url(),
'feed_location' => $config['feed_url'],
'feed_location' => $feed_location,
'feed_format' => 'XML',
'country' => Pinterest_For_Woocommerce()::get_base_country() ?? 'US',
'locale' => LocaleMapper::get_locale_for_api(),
Expand Down
Loading