Merge branch 'bug/category-array-fix' into development

This commit is contained in:
Jay Wood
2016-11-04 09:42:38 -04:00
4 changed files with 11 additions and 6 deletions

View File

@ -6,7 +6,7 @@
![License](https://img.shields.io/badge/License-GPLv2-orange.svg) ![License](https://img.shields.io/badge/License-GPLv2-orange.svg)
[![Issues](https://img.shields.io/github/issues/JayWood/content-warning-v3.svg)](https://github.com/JayWood/content-warning-v3/issues) [![Issues](https://img.shields.io/github/issues/JayWood/content-warning-v3.svg)](https://github.com/JayWood/content-warning-v3/issues)
**Current Version:** 3.7 **Current Version:** 3.7.1
**Tested Up To:** 4.6.1 **Tested Up To:** 4.6.1
**Author:** [Jay Wood](http://github.com/JayWood) **Author:** [Jay Wood](http://github.com/JayWood)
**Author URI:** http://plugish.com **Author URI:** http://plugish.com
@ -75,6 +75,9 @@ Please do not contact me with questions like this. If you cannot be descriptive
## Changelog ## Changelog
### 3.7.1
* Fixed category saving in options Fixes [#59](https://github.com/JayWood/content-warning-v3/issues/59)
### 3.7 ### 3.7
* Fixed an opacity bug where if user set opacity to 0, it was ignored. This should no longer happen. * Fixed an opacity bug where if user set opacity to 0, it was ignored. This should no longer happen.
* Move to the settings API, drop JW Simple Options framework ( I was a newbie when I made it ). Fixes [#45](https://github.com/JayWood/content-warning-v3/issues/45) * Move to the settings API, drop JW Simple Options framework ( I was a newbie when I made it ). Fixes [#45](https://github.com/JayWood/content-warning-v3/issues/45)

View File

@ -4,7 +4,7 @@ Plugin Name: Content Warning v2
Plugin URI: http://plugish.com/plugins/content-warning-v2 Plugin URI: http://plugish.com/plugins/content-warning-v2
Description: A WordPress Plugin to allow site owners to display an acceptance dialog. Used mainly for NSFW websites, this plugin provides a dialog popup to warn viewers of it's possible content. Description: A WordPress Plugin to allow site owners to display an acceptance dialog. Used mainly for NSFW websites, this plugin provides a dialog popup to warn viewers of it's possible content.
Author: Jerry Wood Jr. Author: Jerry Wood Jr.
Version: 3.7 Version: 3.7.1
Author URI: http://plugish.com Author URI: http://plugish.com
Text Domain: content-warning-v2 Text Domain: content-warning-v2
Domain Path: /lang Domain Path: /lang
@ -45,7 +45,7 @@ class ContentWarning_v2 {
*/ */
public static $instance = null; public static $instance = null;
const VERSION = '3.7'; const VERSION = '3.7.1';
/** /**
* Rather or not scripts should be minified * Rather or not scripts should be minified

View File

@ -331,9 +331,8 @@ class CWV2_Settings {
} }
$option_value = get_option( $field_id, $field_id, $default ); $option_value = get_option( $field_id, $field_id, $default );
?> ?>
<select name="<?php echo $field_id; ?>" id="<?php echo $field_id; ?>" class="cwv2_select2 widefat" multiple="multiple"> <select name="<?php echo $field_id; ?>[]" id="<?php echo $field_id; ?>" class="cwv2_select2 widefat" multiple="multiple">
<?php foreach ( $options as $k => $v ) : ?> <?php foreach ( $options as $k => $v ) : ?>
<option value="<?php echo $k; ?>" <?php $this->selected_array( $option_value, $k ); ?>><?php echo $v; ?></option> <option value="<?php echo $k; ?>" <?php $this->selected_array( $option_value, $k ); ?>><?php echo $v; ?></option>
<?php endforeach; ?> <?php endforeach; ?>

View File

@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
Tags: warning, message, lading page, front page, enter page, adult content, consent, age verification, validation Tags: warning, message, lading page, front page, enter page, adult content, consent, age verification, validation
Requires at least: 3.5 Requires at least: 3.5
Tested up to: 4.6.1 Tested up to: 4.6.1
Stable tag: 3.7 Stable tag: 3.7.1
A plugin that provides a warning box with a ton more options completely re-written from the ground up. A plugin that provides a warning box with a ton more options completely re-written from the ground up.
== Description == == Description ==
@ -105,6 +105,9 @@ Please do not contact me with questions like this. If you cannot be descriptive
== Changelog == == Changelog ==
= 3.7.1 =
* Fixed category saving in options Fixes [#59](https://github.com/JayWood/content-warning-v3/issues/59)
= 3.7 = = 3.7 =
* Fixed an opacity bug where if user set opacity to 0, it was ignored. This should no longer happen. * Fixed an opacity bug where if user set opacity to 0, it was ignored. This should no longer happen.
* Move to the settings API, drop JW Simple Options framework ( I was a newbie when I made it ). Fixes [#45](https://github.com/JayWood/content-warning-v3/issues/45) * Move to the settings API, drop JW Simple Options framework ( I was a newbie when I made it ). Fixes [#45](https://github.com/JayWood/content-warning-v3/issues/45)