Skip to content
This repository has been archived by the owner on Mar 29, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release/2.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
remcotolsma committed Nov 24, 2014
2 parents 13463db + 978217a commit 1d2a161
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion classes/class-plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Pronamic_WP_WC_StockSyncPlugin {
*
* @var string
*/
public $version = '2.0.1';
public $version = '2.0.2';

//////////////////////////////////////////////////

Expand Down
2 changes: 1 addition & 1 deletion classes/class-synchronizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public function product_set_stock( $product ) {
public function get_sync_url( $url ) {
$url = add_query_arg( urlencode_deep( array(
'wc_stock_sync' => true,
'source' => site_url( '/' ),
'source' => parse_url( site_url( '/' ), PHP_URL_HOST ),
'password' => get_option( 'woocommerce_stock_sync_password' ),
) ), $url );

Expand Down
Binary file modified languages/woocommerce_stock_sync-nl_NL.mo
Binary file not shown.
6 changes: 3 additions & 3 deletions languages/woocommerce_stock_sync-nl_NL.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ msgstr ""
"Project-Id-Version: WooCommerce Stock Synchronization\n"
"Report-Msgid-Bugs-To: http://wordpress.org/support/plugin/stock-"
"synchronization\n"
"POT-Creation-Date: 2014-10-06 07:35:14+00:00\n"
"PO-Revision-Date: 2014-10-06 09:36+0100\n"
"POT-Creation-Date: 2014-11-24 09:29:24+00:00\n"
"PO-Revision-Date: 2014-11-24 10:29+0100\n"
"Last-Translator: Remco Tolsma <info@remcotolsma.nl>\n"
"Language-Team: Pronamic <info@pronamic.nl>\n"
"Language: nl_NL\n"
Expand All @@ -13,7 +13,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-KeywordsList: __;_e\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Poedit 1.6.9\n"
"X-Generator: Poedit 1.6.10\n"
"X-Poedit-SourceCharset: UTF-8\n"

#: admin/page.php:4
Expand Down
4 changes: 2 additions & 2 deletions languages/woocommerce_stock_sync.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# This file is distributed under the GPLv2.
msgid ""
msgstr ""
"Project-Id-Version: WooCommerce Stock Synchronization 2.0.1\n"
"Project-Id-Version: WooCommerce Stock Synchronization 2.0.2\n"
"Report-Msgid-Bugs-To: "
"http://wordpress.org/support/plugin/stock-synchronization\n"
"POT-Creation-Date: 2014-10-06 07:35:14+00:00\n"
"POT-Creation-Date: 2014-11-24 09:29:24+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "woocommerce-stock-synchronization",
"version": "2.0.1",
"version": "2.0.2",
"description": "Synchronizes stock with sites that are connected to one another, using WooCommerce Stock Synchronization.",
"repository": {
"type": "git",
Expand All @@ -23,6 +23,6 @@
"grunt-checkwpversion": "^0.3.0",
"grunt-phpcs": "^0.2.3",
"grunt-phplint": "0.0.5",
"grunt-wp-i18n": "^0.4.8"
"grunt-wp-i18n": "^0.4.9"
}
}
3 changes: 2 additions & 1 deletion phpcs.ruleset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
<description>A custom set of rules to check for the WooCommerce Stock Synchronization WordPress plugin.</description>

<rule ref="WordPress">
<exclude name="Generic.WhiteSpace.ScopeIndent.Incorrect" />

<exclude name="WordPress.VIP.DirectDatabaseQuery" />
<exclude name="WordPress.VIP.PostsPerPage.posts_per_page" />
<exclude name="WordPress.VIP.RestrictedFunctions.file_get_contents" />
<exclude name="WordPress.VIP.SlowDBQuery.slow_db_query" />
<exclude name="WordPress.WhiteSpace.ScopeIndent.Incorrect" />
</rule>
</ruleset>
5 changes: 4 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributors: pronamic, remcotolsma
Tags: woocommerce, stock, sync, synchronization
Requires at least: 3.0
Tested up to: 4.0
Stable tag: 2.0.1
Stable tag: 2.0.2
License: GPLv2
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand All @@ -24,6 +24,9 @@ Synchronizes stock with sites that are connected to one another, using WooCommer

== Changelog ==

= 2.0.2 =
* Tweak - No longer send full site URL, instead only sent the hostname of the site URL.

= 2.0.1 =
* Fix - Make sure we URL encode some parameters in the synchronize URL's.

Expand Down
2 changes: 1 addition & 1 deletion stock-synchronization.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Plugin URI: http://www.happywp.com/plugins/woocommerce-stock-synchronization/
Description: Synchronizes stock with sites that are connected to one another, using WooCommerce Stock Synchronization.
Version: 2.0.1
Version: 2.0.2
Requires at least: 3.0
Author: Pronamic
Expand Down

0 comments on commit 1d2a161

Please sign in to comment.