Skip to content

Test with latest WordPress #252

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

Open
sandhya09 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Test with latest WordPress #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
304119c
Merge pull request #1 from trewknowledge/master
sandhya09 May 28, 2018
d3e2970
checkbox should ideally wrapped under the label tag
sandhya09 May 28, 2018
8bb1440
Merge branch 'develop' into master
fclaussen Jun 5, 2018
f15ae24
Test with latest wordpress
Dec 7, 2019
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@ Activating this plugin does not guarantee that an organisation is successfully m

## Changelog

##### 2.1.1
* Tested with latest WordPress

##### 2.1.0
* Wrapping checkboxes in labels so they stay in the same line.
* Adding initial WPML and Polylang translation config file.
Expand Down
7 changes: 5 additions & 2 deletions README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Donate link: http://gdpr-wp.com/donate/
Tags: gdpr, compliance, privacy, law, general data protection regulation
Requires at least: 4.7
Requires PHP: 5.6
Tested up to: 4.9
Stable tag: 2.1.0
Tested up to: 5.3
Stable tag: 2.1.1
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -206,6 +206,9 @@ Activating this plugin does not guarantee that an organisation is successfully m

== Changelog ==

= 2.1.1 =
* Tested with latest WordPress

= 2.1.0 =
* Wrapping checkboxes in labels so they stay in the same line.
* Adding initial WPML and Polylang translation config file.
Expand Down
4 changes: 2 additions & 2 deletions gdpr.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* Plugin Name: GDPR
* Plugin URI: https://trewknowledge.com
* Description: This plugin is meant to assist a Controller, Data Processor, and Data Protection Officer (DPO) with efforts to meet the obligations and rights enacted under the GDPR.
* Version: 2.1.0
* Version: 2.1.1
* Author: Trew Knowledge
* Author URI: https://trewknowledge.com
* License: GPL-2.0+
Expand All @@ -35,7 +35,7 @@
* Start at version 1.0.0 and use SemVer - https://semver.org
* Rename this for your plugin and update it as you release new versions.
*/
define( 'GDPR_VERSION', '2.1.0' );
define( 'GDPR_VERSION', '2.1.1' );

/**
* The minimum PHP version required to run the plugin.
Expand Down
2 changes: 1 addition & 1 deletion includes/class-gdpr.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ public static function get_consent_checkboxes( $consent_key = false ) {
$required = ( isset( $consent['policy-page'] ) && $consent['policy-page'] ) ? 'required' : '';
$checked = ( isset( $sent_extras[ $key ] ) ) ? checked( $sent_extras[ $key ], 1, false ) : '';
echo '<p>' .
'<label class="gdpr-label">' .
'<label class="gdpr-label">' .
'<input type="checkbox" name="user_consents[' . esc_attr( $key ) . ']" id="' . esc_attr( $key ) . '-consent" value="1" ' . esc_html( $required ) . ' ' . esc_html( $checked ) . '>' .
wp_kses( $consent['registration'], $allowed_html ) .'</label>' .
'</p>';
Expand Down