Commit Graph

5137 Commits

Author SHA1 Message Date
tgglv c0d9fc7fc3
Make WP.org plugin support installation method names more precise 2019-07-11 15:58:06 +07:00
tgglv 6eeefd1341
Add WP.org plugin support into Product Activation 2019-07-11 15:58:05 +07:00
tgglv 1fae1d7ba2
Remove redundant line 2019-07-11 15:58:05 +07:00
tgglv 527fbca149
Store product's `installed_path` 2019-07-11 15:58:05 +07:00
tgglv 1dff186076
Add @return types into annotations 2019-07-11 15:58:05 +07:00
tgglv be63fba4cd
Fix typo 2019-07-11 15:58:05 +07:00
tgglv 5bde7b5161
Fix PHP CodeSniffer issues 2019-07-11 15:58:05 +07:00
Akeda Bagus 52a68177a0
Add product info retrieval step before downloading product. 2019-07-11 15:58:04 +07:00
Akeda Bagus 6854f3bdca
Update the state when installation finished. 2019-07-11 15:58:04 +07:00
Akeda Bagus 7ac8232d2c
Make sure to init the upgrader and clean plugins cache before activate. 2019-07-11 15:58:04 +07:00
Akeda Bagus b57f05fde9
Add missing description in docblock. 2019-07-11 15:58:04 +07:00
Akeda Bagus 69a4aa926a
Fix typo in error message. 2019-07-11 15:58:04 +07:00
Akeda Bagus 7adc256344
Move subscription check as part of installation steps. 2019-07-11 15:58:03 +07:00
Akeda Bagus 72ba4ed2e5
Include helper product install class in main helper class. 2019-07-11 15:55:16 +07:00
Akeda Bagus 61b0d974f4
Add reset state. 2019-07-11 15:55:16 +07:00
Akeda Bagus d088aea85d
Initial work of adding product install API on top of helper. 2019-07-11 15:55:11 +07:00
Rodrigo Primo e5857e91f9 Merge branch 'master' into fix/23508 2019-07-10 16:11:07 -03:00
Claudio Sanches c63cd802aa
Merge pull request #23957 from woocommerce/feature/feature-plugin-packages
Include external feature plugins as packages
2019-07-10 15:47:48 -03:00
Claudio Sanches 5b8694e92a
Merge pull request #23915 from woocommerce/fix/23544
[Setup] Make PostCode optional as few countries don't use them
2019-07-10 15:45:32 -03:00
Mike Jolley c928188831 Update from master 2019-07-10 12:57:02 +01:00
aslamshekh 3df0769366 I have done with few changes which is suggested. 2019-07-10 14:52:59 +05:30
aslamshekh 15eaaebdeb Fix-24115, Downloads report not getting 503 any more, If previously downloaded files are removed from product 2019-07-10 12:58:07 +05:30
Gerhard Potgieter 600da8cee2
Merge pull request #24112 from woocommerce/fix/tax-class-initialization
Fix Tax Class table initialization
2019-07-10 08:38:31 +02:00
Claudio Sanches d18c3f8ed1
Merge pull request #24069 from woocommerce/add/coupon-code-generator
Add generate coupon code button
2019-07-09 16:50:24 -03:00
Claudio Sanches 18b876a95c Always load generate code button
Some improvements in the button label and names
2019-07-09 16:46:17 -03:00
Rodrigo Primo 53df16b2b5
Merge pull request #23781 from woocommerce/try/obw-changes
OBW: Switch shipping labels and shipping zones placement
2019-07-09 16:06:38 -03:00
Claudio Sanches 0e5c0eeccd
Merge pull request #23091 from woocommerce/fix/23087
Move settings save functionality to wp_loaded hook
2019-07-09 15:47:41 -03:00
Claudio Sanches 56240c9633 Prevent saving empty tax classes into the database 2019-07-09 15:23:46 -03:00
vedanshujain dd783615cc Use helper method instead of `wp_list_pluck` to avoid notices
In country locales, many times configuration for postcodes may not be defined. In these cases, using `wp_list_pluck` will throw notices.

We now use a small helper method to extract post code configuration from country locales.
2019-07-09 18:13:27 +05:30
vedanshujain e2577b3a06 [Setup] Make PostCode optional as few countries don't use them
Some countries like Hong Kong, UAE etc don't use post codes, in which case this commit will make the field optional.
If its not known whether a country uses postcode or not, it will be required.
2019-07-09 14:37:03 +05:30
Claudio Sanches 55692cba87
Merge pull request #23255 from woocommerce/shopify-column-mapping
Mapping for default Shopify fields
2019-07-08 18:53:57 -03:00
Claudio Sanches c1223e3890 Fixed meta: label 2019-07-08 18:52:03 -03:00
Claudio Sanches db06d3dbae Merge branch 'master' into update/22164-tax-rate-class-table 2019-07-08 18:12:23 -03:00
Claudio Sanches b54997d9f5 Merge branch 'fix/23221' of https://github.com/senff/woocommerce into senff-fix/23221 2019-07-08 17:55:07 -03:00
Claudio Sanches adc543f8f1
Merge pull request #24058 from woocommerce/add/wc-admin-obw-recommended
OBW: Add wc-admin to recommended page
2019-07-08 16:56:49 -03:00
Claudio Sanches da99bc8ca0 Merge branch 'master' into feature/feature-plugin-packages 2019-07-08 14:33:21 -03:00
Paul Sealock 8777dc4c01 Revert title to WooCommerce Admin 2019-07-05 16:11:35 +12:00
Paul Sealock 1116e5516d update 'free' usage and wc-admin description 2019-07-05 16:10:10 +12:00
Rodrigo Primo b648647893
Merge pull request #23741 from woocommerce/feature/23728
Allows customize buyer name in orders list screen
2019-07-04 16:23:43 -03:00
Rodrigo Primo 4712f75f67 Merge branch 'master' into fix/23508 2019-07-04 16:13:01 -03:00
Rodrigo Primo 4de12633d6
Merge pull request #24073 from woocommerce/fix/status-helper-disconnected-typo
Fix missing space and closing <strong> tag in WooCommerce.com disconnect message
2019-07-04 16:05:59 -03:00
Rodrigo Primo a26f38f3a1
Merge pull request #23133 from woocommerce/update/23111
If variations are missing prices, show notice
2019-07-04 10:08:41 -03:00
Gerhard Potgieter 12fbfa5677
Merge pull request #22927 from woocommerce/update/22895
Allow "Thanks" wording in emails to be reworded by admin
2019-07-04 12:43:00 +02:00
Daniel Bitzer 20625e9a45 Fix missing space and closing <strong> tag
Strong tag was not being echoed and space was missing after full stop.
2019-07-04 16:57:50 +09:30
Gerhard Potgieter c3a25bb6bf
Merge pull request #23884 from woocommerce/fix/23875
Prevents taxes columns from being removed when the order is no longer editable
2019-07-04 09:25:49 +02:00
Gerhard Potgieter 007fc457a3
Merge pull request #24020 from woocommerce/fix/plural-forms-usage
Correct singular form usage in class-wc-admin-report.php
2019-07-04 09:23:14 +02:00
Gerhard 5d604329fc Reword postfix to suffix 2019-07-04 09:07:02 +02:00
Gerhard 9e2ba43d3b Forgot the 9 2019-07-04 09:05:05 +02:00
Gerhard 164f09e9c7 Remove abiguous characters that are dificult to read. 2019-07-04 09:00:15 +02:00
Gerhard 538edcaac0 Make button text translatable. 2019-07-03 22:57:08 +02:00
Gerhard 24fc4948c0 Add generate coupon code button for quick coupon code generation. 2019-07-03 22:48:30 +02:00
Mark Senff 9c013b132b
Update html-product-attribute.php 2019-07-03 07:30:32 -04:00
Gerhard 8a972ee5c3 Add check for empty string when checking meta_value since checking an empty string in mysql against an int results in a 0 value. 2019-07-03 12:37:28 +02:00
Paul Sealock 01f428d34f install plugin 2019-07-03 13:12:24 +12:00
Paul Sealock b65ce3dd26 OBW: Add wc-admin to recommended page 2019-07-03 13:02:07 +12:00
Peter Fabian 6727fdba62 Updated constants' names to better reflect their usage. 2019-07-02 18:44:43 +02:00
Rodrigo Primo 737f6af5e8 Introduce file type check for tax rate importer 2019-07-02 10:44:21 -03:00
Rodrigo Primo cabf9de71a Added nonce check to CSV importer actions 2019-07-02 10:37:46 -03:00
Rodrigo Primo 18813662dd Fix link to documentation about WordPress and PHP minimum requirements 2019-07-02 09:19:39 -03:00
Rodrigo Primo b08fd05a7d Fix: check if DB_NAME is defined before using it
WooCommerce relies on the constant DB_NAME to display information about the database tables in the system status page. The problem is that this constant is not always defined (e.g., when the plugin HyperDB is used to replace the standard wpdb class). When that is the case, WooCommerce will incorrectly say that its core tables are missing and the following PHP warning will be generated:

```
Use of undefined constant DB_NAME - assumed 'DB_NAME' (this will throw an Error in a future version of PHP)
wp-content/plugins/woocommerce/includes/api/v2/class-wc-rest-system-status-v2-controller.php:708
```

To fix this, this commit checks to see if DB_NAME is defined before using it. When the constant is not set, WooCommerce will display the following message to the users instead of the list of supposedly missing tables:

```
Database information: Unable to retrieve database information. Usually, this is not a problem, and it only means that your install is using a class that replaces the WordPress database class (e.g., HyperDB) and WooCommerce is unable to get database information.
```
2019-06-28 17:57:54 -03:00
Rodrigo Primo f3b0d755fd Correct singular form usage in class-wc-admin-report.php
For more information see https://github.com/woocommerce/woocommerce/issues/24004
2019-06-27 11:03:35 -03:00
Rodrigo Primo 3f2cacb1be Use phpcbf to fix phpcs violations in class-wc-admin-report.php 2019-06-27 10:48:31 -03:00
Gerhard Potgieter 698625ce1d WP & PHP Upgrade Notices (#23975)
This commit introduces a banner that notifies and prompts users to upgrade their WordPress and/or PHP if they are outdated and not part of the minimum required versions going into WooCommerce 3.7.

* Add backward compatible function wp_check_php_version for sites running WP version smaller than 5.1

* Refactor some messaging, move widget to top of WC dashboard widgets, add buttons linking out to WP pages with instructions.

* Add missing variables for adding nag class

* Add styling to dashboard widget

* Rework css to use exclamation instead

* Clean up widget, make sure no widget is registered when dismissed. Add banner that links to widget and make it dismissable.

* Update constant to reflect minimum requirements.

* Don't show banner. Fix undefined variable.

* Remove dashboard widget

* Update banner link to docs site

* Add link to docs page where instructions live for updating

* Change button text

* Add UTM params to docs link

* Moved the msg logic from template to php file.

* Bail out early when PHP and WP versions are ok.

* Added missing translation functiog

* Extracted notice function from reset_admin_notices.

To follow suit with other similar functions in the file.

* Synchronize fetching of WP version.

* Removed unused functions.

* Corrected indent.

* Reduce number of variables and fixed coding standards

* Updated wording of the notice.
2019-06-26 14:09:20 -03:00
Mike Jolley a0a58cfb15 update from master 2019-06-26 15:26:47 +01:00
Claudio Sanches 45f1ac63e0
Merge pull request #23935 from malviyaritesh/fix/23931-sale-tooltip
Change misleading tooltip for product sale meta box
2019-06-24 12:35:04 -03:00
Claudio Sanches c04f7b79f9
Merge pull request #23919 from woocommerce/fix/codex-memory-limit-link
Updated documentation about increasing memory allocated to php
2019-06-24 12:12:11 -03:00
Mike Jolley ed0a4aae1f update shipping saving in setup wizard 2019-06-21 13:59:51 +01:00
Mike Jolley 3a1c401a5b update status report 2019-06-21 13:59:40 +01:00
Mike Jolley 5b105d0c7f Init the API and add to status report 2019-06-21 13:40:53 +01:00
Claudio Sanches 02aafa1948
Merge pull request #23911 from woocommerce/update/23887
Update auto username generation description
2019-06-19 20:22:02 -03:00
Claudio Sanches 569e8a5b8f
Merge pull request #23925 from webdados/patch-2
Display Status > Logs timestamp with the Y-m-d H:i:s format
2019-06-19 19:11:13 -03:00
rmalviya 4190e9fd4b Add missing post_type=product in url
Show Products->Categories active when clicked on "Make Default" link
under any product category and fix #23923.
2019-06-14 12:28:08 +05:30
rmalviya 0e896f82fa Change misleading tooltip for product sale meta box
Clarify the sale start and end time by changing the tooltip for
product sale price dates and fix #23931.
2019-06-14 11:12:54 +05:30
Marco Almeida 3b7be608e4
Display Status > Log timestamp with the Y-m-d H:i:s format
Display WooCommerce > Statis > Log timestamp, when using WC_Log_Handler_DB, with the Y-m-d H:i:s format instead of the WordPress global date and time format options, because we need more detail on the shown timestamps and that might not be compatible with what we want for our global options.
2019-06-13 10:58:41 +01:00
Claudio Sanches 3ce6acec74 Updated outdated codex URLs 2019-06-12 19:31:01 -03:00
Claudio Sanches 5624af43a7 Updated docs about increasing memory allocated to php 2019-06-12 19:04:24 -03:00
Gerhard 84b6fa144f Update description for automatic username generation to reflect how it actually works. 2019-06-12 12:13:41 +02:00
Claudio Sanches 47c370809e Prevents taxes columns from being removed when the order is no longer editable 2019-06-07 10:07:32 -03:00
Claudio Sanches 2e90e9ab65
Merge pull request #23743 from Sisanu/issue-23717-enhancement-hook
Implement the info & extra actions new filter for Product gallery
2019-05-28 18:22:33 -03:00
Rodrigo Primo 000c95ea88
Merge pull request #23659 from woocommerce/add/wc-admin-install-nudge
Add wc-admin notice.
2019-05-27 12:29:43 -03:00
Valerie 136613f539 OBW Shipping: Update labels description
- replace "Print shipping labels at home" heading with
"Did you know you can print shipping labels at home?"
- Use new description for WooCommerce Services:
"'Use WooCommerce Shipping (powered by WooCommerce Services & Jetpack)
to save time at the post office by printing your shipping labels
at home."
- do not capitalize post office
2019-05-23 22:17:17 -04:00
Valerie b379739ea6 OBW Shipping: Switch label and zone sections 2019-05-23 22:17:13 -04:00
Valerie 6d77056e77 OBW: Fix stranded ul closing tag 2019-05-23 22:17:03 -04:00
Iulia Cazan f49cec5108 Coding standard updates 2019-05-23 08:58:13 +03:00
Claudio Sanches 17da960abe
Merge pull request #23137 from woocommerce/fix/23051
Change coupon amount field type based on coupon type
2019-05-22 21:19:03 -03:00
Claudio Sanches 196d5e77cb
Merge pull request #23041 from woocommerce/update/21701
Add hooks for helper subscription changes
2019-05-21 18:27:15 -03:00
Claudio Sanches 4a99a11009 Merge branch 'master' into update/22895 2019-05-21 17:46:16 -03:00
Iulia Cazan 051277d26e Rename the hook 2019-05-21 09:20:46 +03:00
Iulia Cazan 1187563c93 Transform the filter into action, rewrite the piece of code to pass the coding standards, remove markup restriction. 2019-05-21 09:18:15 +03:00
Timmy Crawford 01f1749684 Change version compare. 2019-05-17 13:53:38 -07:00
Timmy Crawford 43cd7dc04c Add wc-admin notice. 2019-05-17 13:53:37 -07:00
Rodrigo Primo f8642f2fbb Remove code duplication from OBW payment gateway logic
In #23690 we implemented a few changes to the logic to decide which
payment gateways to display in the onboarding wizard. When working on
this code, we noticed that there was a bit of duplication in it that was
not necessary (see
https://github.com/woocommerce/woocommerce/pull/23690#discussion_r284004924).
We opted to remove this duplication in a different commit, since that PR
was included in a patch release.
2019-05-17 10:32:06 -03:00
Iulia Cazan a1ac64aa30 Implement a new filter that allows for custom info or extra actions to be exposed for each of the attachments selected in the Product gallery 2019-05-17 12:03:40 +03:00
Claudio Sanches d807119121 Introduced woocommerce_admin_order_buyer_name filter 2019-05-16 19:02:57 -03:00
Gerhard Potgieter afd7e72c03
Merge pull request #23690 from woocommerce/update/obw-stripe
Update OWB Payment Gateway structure
2019-05-16 18:26:29 +02:00
Gerhard 0eef8654f6 payapal enabled setting defaults to false 2019-05-16 16:08:46 +02:00
Gerhard 99b183e5bb Refactor paypal and stripe combined logic, add fallback to specified settings when previously saved settings were detected by no option present for the enabled setting. 2019-05-16 15:35:29 +02:00
Gerhard b0a831b64f OWB: Check PayPal by default when Stripe not available. 2019-05-16 15:26:58 +02:00
Gerhard Potgieter 173b706ccb
Merge pull request #23734 from woocommerce/fix/23676-2
Dashboard stock queries should only include published products
2019-05-16 15:16:18 +02:00
Rodrigo Primo a247e08ad0 Fix query used to get the number of low stock products in the dashboard
This commits changes the query used to get the number of low stock
products in the WooCommerce Status widget in the admin dashboard. This
query should only count published products and ignore products with
other statuses to match the behavior used in the low stock report.
2019-05-16 09:45:44 -03:00
Rodrigo Primo 6e976c7f0c Remove unnecessary conditions from out of stock query
In the query to get the number of out of stock products for the admin
dashboard widget, it is not necessary to use `1=1` and also not
necessary to use `posts.post_type IN ( 'product', 'product_variation' )`
as only products are added to wp_wc_product_meta_lookup.
2019-05-16 09:41:52 -03:00
Gerhard Potgieter 9f0e1a6e64
Merge pull request #23534 from woocommerce/fix/233880-alt
Revise update stock logic
2019-05-16 14:15:13 +02:00
Gerhard b694efcb63 Klarna should not be featured. 2019-05-14 07:36:15 +02:00
Gerhard e131b01133 Modify payment gateway placement, defaults and new logos. 2019-05-13 15:54:44 +02:00
Gerhard 36cab83d76 Update out of stock dashboard widget to use same query as in reporting, this only counts published products. 2019-05-13 11:02:50 +02:00
Gerhard Potgieter 32769d0d76
Merge pull request #23625 from woocommerce/fix/23549
Use attribute's orderby option to sort terms in product's edit screen
2019-05-10 11:19:08 +02:00
Gerhard Potgieter 18e2332cfc
Merge pull request #23590 from woocommerce/fix/23587
Stock sorting issue when Yoast installed
2019-05-10 11:17:26 +02:00
Gerhard Potgieter 902cc1f0b0
Merge branch 'master' into fix/23606 2019-05-10 11:12:54 +02:00
Gerhard Potgieter 364093056d
Merge pull request #23580 from woocommerce/report-bug-link
Change the link of the "Report a bug" button
2019-05-10 10:59:24 +02:00
Gerhard Potgieter 984357fb41
Merge pull request #23597 from woocommerce/fix/23509
Added confirmation before saving empty list of countries to sell to.
2019-05-10 10:56:13 +02:00
Gerhard Potgieter 07ea25377a
Merge pull request #23517 from woocommerce/fix/23506
Fix dismiss button in two WC admin notices
2019-05-10 10:37:01 +02:00
Gerhard Potgieter af574f6484
Merge pull request #23456 from woocommerce/fix/23447
Disable export of scheduled action posts
2019-05-10 10:27:34 +02:00
Gerhard 84b75c31ad Three equals 2019-05-09 12:57:25 +02:00
Claudio Sanches 490219de7c Use attributes orderby options to sort terms in product's edit screen 2019-05-06 20:39:36 -03:00
Gerhard 48e6083adc Restore param and return for backward compatibility. 2019-05-06 14:47:27 +02:00
Gerhard b1e2a0119a Fix system status connected to woocommerce.com status 2019-05-06 10:11:59 +02:00
Peter Fabian 98edbd2f78 Added confirmation before saving an empty list of countries to sell to in general WC settings. 2019-05-02 21:26:29 +02:00
Peter Fabian 3caee4451d Fixed PHPCS. 2019-05-02 21:20:08 +02:00
Peter Fabian b891bfe238 Removed unused variables. 2019-05-02 17:53:50 +02:00
Gerhard 48000e63a1 Move remove_ordering_args calls from the_posts filter to query_filters method, this avoids conflicts with other plugins also hooking in and modify the args. 2019-05-02 14:31:30 +02:00
Rodrigo Primo 5ed76fd067 Change the link of the "Report a bug" button
Changes the link of the "Report a bug" button from https://github.com/woocommerce/woocommerce/issues?state=open to https://github.com/woocommerce/woocommerce/issues/new?template=Bug_report.md. When users click on this button, they should go directly to the new issue page, instead of the page that list issues.
2019-05-01 22:58:55 -03:00
Mike Jolley a7279bd261 Revert double saving change 2019-04-26 17:19:41 +01:00
Rodrigo Primo 00128fec58 Fix dismiss button in two WC admin notices
The dismiss button in the WC admin notices `legacy_shipping` and `no_shipping_methods` was not fully clickable due to a custom CSS applied to them. This custom CSS was used to add a background image to those notices. More specifically, the problem was caused by the use of `position: relative` applied to `<p>` elements. I couldn't find an easy way to fix this problem keeping the custom background image, so I opted to remove it to make the design of all notices identical (besides the background image, the custom CSS also added a few other differences to those to notices like the font size of the notice title).
2019-04-25 14:19:35 -03:00
Rodrigo Primo 5c1936bfdd PHPCS fixes 2019-04-25 14:12:45 -03:00
Peter Fabian abf1b7450d Save the product before calling wc_update_product_stock to ensure data consistency and set quantity in local copy after saving it to db in wc_update_product_stock.
wc_update_product_stock reads product from the db twice, so if it's out of sync, strange things are happening.
Also, changes dependant on stock status might get reverted if local copy of $product is not updated after wc_update_product_stock.
2019-04-25 14:57:08 +02:00
parmarhardip 8ffd78372f - coding standard improve 2019-04-25 10:25:17 +05:30
Mike Jolley 036a91d20c
Merge pull request #23484 from woocommerce/update/marketplace-queue-handling
Marketplace queue handling - avoid recurring event
2019-04-24 17:00:40 +01:00
Mike Jolley 9776e346b3 cancel_all 2019-04-24 16:28:28 +01:00
Mike Jolley 1efcecddc5
Merge pull request #23469 from dfeuster/master
corrected anchor href from old codex to new location
2019-04-24 16:11:32 +01:00
Mike Jolley 98dfb8e8c2
Merge pull request #23446 from woocommerce/fix/23439
Product list table shipping class tax_query
2019-04-24 14:56:00 +01:00
Mike Jolley 9d9f7bec59
Merge pull request #23383 from woocommerce/update/update-notices
[3.6] More useful update notices if cron is disabled
2019-04-24 14:49:44 +01:00
parmarhardip 7b8d7d7390 - autoload false and check Travis CI build 2019-04-24 19:03:19 +05:30
parmarhardip 4c90f566bb - Prevent the Cart, checkout and my account page from being set to the same page. 2019-04-24 17:31:20 +05:30
Mike Jolley 618e98f4e0 Avoid queue on init 2019-04-24 13:00:23 +01:00
Mike Jolley db67172b75 Queue single event only as needed 2019-04-24 13:00:16 +01:00
parmarhardip 2122a84d8b - coding standard check 2019-04-24 16:34:28 +05:30
parmarhardip f643c516d1 enhance #23381 Prevent the Cart, checkout and my account page from being set to the same page. 2019-04-24 15:59:14 +05:30
Daniel Feuster dfe8ac43bf corrected anchor href from old codex to new location 2019-04-23 16:54:44 -05:00
Ron Rennick 130ebf95cd phpcs sniff fixes for class-wc-admin.php 2019-04-23 12:07:02 -03:00
Ron Rennick d2d342f30e disable export of scheduled action posts 2019-04-23 12:03:30 -03:00
Mike Jolley 6c36c71a65 Remove red styling 2019-04-23 12:10:07 +01:00
Mike Jolley 6589c04dab Merge branch 'update/update-notices' of https://github.com/woocommerce/woocommerce into update/update-notices 2019-04-23 12:01:18 +01:00
Mike Jolley 3cb3d5df4e Prevent tab causing extra white space 2019-04-23 12:01:13 +01:00
Gerhard 0f00eb9a79 Fix product list table shipping class tax_query 2019-04-23 11:19:07 +02:00
Rodrigo Primo ac70d1e9b2 Fix copy and paste error in code documentation 2019-04-22 11:43:09 -03:00
Mike Jolley 7ef1fd5ea6 More useful update notices 2019-04-18 20:06:17 +01:00
Mike Jolley d411f082d7 Added missing wp_unslash 2019-04-18 18:52:51 +01:00
Mike Jolley e1e13dee91 merge conflict 2019-04-18 12:06:13 +01:00
Mike Jolley 2033a231a4 Update from master 2019-04-18 12:05:23 +01:00
Mike Jolley 8d5d7b2463 Update from master 2019-04-18 11:56:47 +01:00