Skip to content

Commit

Permalink
Merge pull request #485 from WebDevStudios/chore/prep-release-1.8.5
Browse files Browse the repository at this point in the history
Chore/prep release 1.8.5
  • Loading branch information
richaber authored Jun 26, 2020
2 parents 9efd986 + 63a2a15 commit 8f8da1a
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 37 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
= 1.8.5 =
* Added: Forced email notifications to admin when Constant Contact API request fails on attempted form submission.
* Fixed: Addressed issues with plugin error logging and addressed false-positive error messaging.
* Fixed: Cleaned up style minification task to allow for unminified version of stylesheet.
* Updated: Updated support error messaging in admin to reference tab structure of plugin settings.

= 1.8.4 =
* Fixed: Compatibility issue with PHP 5.6.

Expand Down
6 changes: 3 additions & 3 deletions constant-contact-forms.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Plugin Name: Constant Contact Forms for WordPress
* Plugin URI: https://www.constantcontact.com
* Description: Be a better marketer. All it takes is Constant Contact email marketing.
* Version: 1.8.4
* Version: 1.8.5
* Author: Constant Contact
* Author URI: https://www.constantcontact.com/index?pn=miwordpress
* License: GPLv3
Expand Down Expand Up @@ -72,7 +72,7 @@ class Constant_Contact {
* @since 1.0.0
* @var string
*/
const VERSION = '1.8.4';
const VERSION = '1.8.5';

/**
* URL of plugin directory.
Expand Down Expand Up @@ -538,7 +538,7 @@ public function init() {
/**
* Initialize debug log on init.
*
* @since NEXT
* @since 1.8.5
*
* @return void
*/
Expand Down
12 changes: 6 additions & 6 deletions includes/class-logging.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class ConstantContact_Logging {
/**
* The logging directory name.
*
* @since NEXT
* @since 1.8.2
* @var string
*/
protected $log_file_dir = 'ctct-logs';
Expand Down Expand Up @@ -401,7 +401,7 @@ public function create_log_file() {
* Retrieve logging file location.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.2
*
* @return string Logging file location.
*/
Expand All @@ -413,7 +413,7 @@ public function get_logging_location() {
* Remove old logging directory and files for older plugin versions (<= 1.8.1).
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.2
*
* @return void
*/
Expand All @@ -429,7 +429,7 @@ public function maybe_delete_old_log_dir() {
* Remove current logging directory and files.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.2
*/
public function delete_current_log_dir() {
$this->delete_log_dir( $this->log_location_dir );
Expand All @@ -439,7 +439,7 @@ public function delete_current_log_dir() {
* Helper function to remove logging directory.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.2
*
* @return void
*/
Expand All @@ -461,7 +461,7 @@ protected function delete_log_dir( $dir = '' ) {
* Initialize Logging directories and files.
*
* @author Richard Aber <[email protected]>
* @since NEXT
* @since 1.8.5
*/
public function initialize_logging() {
$this->create_log_folder();
Expand Down
6 changes: 3 additions & 3 deletions includes/class-notification-content.php
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public static function exceptions() {
/**
* Admin notice regarding deleted forms.
*
* @since NEXT
* @since 1.8.0
*
* @return string Deleted forms notice HTML.
*/
Expand All @@ -214,7 +214,7 @@ public static function deleted_forms() {
/**
* Display deleted form references HTML.
*
* @since NEXT
* @since 1.8.0
*
* @param int $form_id Current form ID.
* @param array $references Current form references.
Expand Down Expand Up @@ -341,7 +341,7 @@ function constant_contact_exceptions_thrown( $notifications = [] ) {
/**
* Add notification on form deletion if instances of that form appear as shortcodes or widgets.
*
* @since NEXT
* @since 1.8.0
*
* @param array $notifications Array of notifications to be shown.
* @return array Array of notifications to be shown.
Expand Down
4 changes: 2 additions & 2 deletions includes/class-notifications.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class ConstantContact_Notifications {
/**
* Option name for deleted forms, containing IDs for post and widget instances of forms.
*
* @since NEXT
* @since 1.8.0
*
* @var string
*/
Expand Down Expand Up @@ -438,7 +438,7 @@ public function get_activation_dismiss_url( $type ) {
*
* Redirect to current page with dismissal query args removal to avoid potentially re-dismissing notices unintentionally.
*
* @since NEXT
* @since 1.8.0
*
* @param string $key Notice option key.
*/
Expand Down
24 changes: 12 additions & 12 deletions includes/class-settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ConstantContact_Settings {
/**
* Settings page metabox titles by id.
*
* @since NEXT
* @since 1.8.0
* @var array|null
*/
private $metabox_titles;
Expand Down Expand Up @@ -93,7 +93,7 @@ public function register_hooks() {
* Add CMB2 hook overrides specific to individual metaboxes.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.0
*
* @return void
*/
Expand Down Expand Up @@ -189,7 +189,7 @@ public function add_options_page_metaboxes() {
* Remove secondary settings page menu items.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.0
*/
public function remove_extra_menu_items() {
foreach ( array_keys( $this->metabox_titles ) as $cmb_key ) {
Expand All @@ -207,7 +207,7 @@ public function remove_extra_menu_items() {
* Override $plugin_page global to ensure "general" menu item active for other settings pages.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.0
*
* @param string $file The parent file.
* @return string The parent file.
Expand All @@ -224,7 +224,7 @@ public function select_primary_menu_item( $file ) {
* Display options page with CMB2 tabs.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.0
*
* @param CMB2_Options_Hookup $cmb_options The CMB2_Options_Hookup object.
*/
Expand Down Expand Up @@ -255,7 +255,7 @@ public function display_tabs( CMB2_Options_Hookup $cmb_options ) {
* Get all option tabs for navigation on CMB2 settings page.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.0
*
* @param CMB2_Options_Hookup $cmb_options The CMB2_Options_Hookup object.
* @return array Array of option tabs.
Expand Down Expand Up @@ -286,7 +286,7 @@ protected function get_option_tabs( CMB2_Options_Hookup $cmb_options ) {
* Get currently selected tab.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.0
*
* @return string Current tab.
*/
Expand All @@ -300,7 +300,7 @@ protected function get_current_tab() {
* Get link to CMB tab.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.0
*
* @param string $option_key CMB tab key.
* @return string URL to CMB tab.
Expand All @@ -313,7 +313,7 @@ protected function get_tab_link( $option_key ) {
* Get args for current CMB.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.0
*
* @param string $cmb_id Current CMB ID.
* @return array CMB args.
Expand All @@ -336,7 +336,7 @@ protected function get_cmb_args( $cmb_id ) {
* Register 'General' settings tab fields.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.0
*/
protected function register_fields_general() {
$cmb = new_cmb2_box( $this->get_cmb_args( 'general' ) );
Expand Down Expand Up @@ -480,7 +480,7 @@ protected function register_fields_general() {
* Register 'Spam Control' (incl. Google reCAPTCHA) settings tab fields.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.0
*/
protected function register_fields_spam() {
$cmb = new_cmb2_box( $this->get_cmb_args( 'spam' ) );
Expand Down Expand Up @@ -556,7 +556,7 @@ protected function register_fields_spam() {
* Register 'Support' settings tab fields.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.0
*/
protected function register_fields_support() {
$cmb = new_cmb2_box( $this->get_cmb_args( 'support' ) );
Expand Down
2 changes: 1 addition & 1 deletion includes/class-uninstall.php
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ private function delete_cron_hooks() {
* Delete logging directory.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.2
*/
private function delete_log_dir() {
constant_contact()->logging->delete_current_log_dir();
Expand Down
12 changes: 6 additions & 6 deletions includes/helper-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ function constant_contact_location_and_line( $location = '', $line = '' ) {
/**
* Get posts containing specified form ID.
*
* @since NEXT
* @since 1.8.0
*
* @param int $form_id Form ID.
* @return array Array of posts containing the form ID.
Expand Down Expand Up @@ -719,7 +719,7 @@ function constant_contact_get_posts_by_form( $form_id ) {
/**
* Get links and info on widgets containing specified form ID.
*
* @since NEXT
* @since 1.8.0
*
* @param int $form_id Form ID.
* @return array Array of widgets containing the form ID.
Expand Down Expand Up @@ -754,7 +754,7 @@ function constant_contact_get_widgets_by_form( $form_id ) {
* Walker callback for widget references of deleted forms.
*
* @author Rebekah Van Epps <[email protected]>
* @since NEXT
* @since 1.8.0
*
* @param array $value Array of current widget settings.
* @param string $key Current widget key.
Expand All @@ -780,7 +780,7 @@ function constant_contact_walk_widget_references( array &$value, $key, $type ) {
/**
* Check for affected posts and widgets for the newly trashed form post type.
*
* @since NEXT
* @since 1.8.0
*
* @param int $form_id Form ID being trashed.
* @return void
Expand All @@ -803,7 +803,7 @@ function constant_contact_check_for_affected_forms_on_trash( $form_id ) {
/**
* Remove saved references to deleted form if restored from trash.
*
* @since NEXT
* @since 1.8.0
*
* @param int $post_id Post ID being restored.
* @return void
Expand All @@ -824,7 +824,7 @@ function constant_contact_remove_form_references_on_restore( $post_id ) {
/**
* Determine whether to display the deleted forms notice in admin.
*
* @since NEXT
* @since 1.8.0
*
* @return bool Whether to display the deleted forms notice.
*/
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "constant-contact-forms",
"version": "1.8.2",
"version": "1.8.5",
"description": "",
"main": "gulpfile.js",
"dependencies": {},
Expand Down
5 changes: 2 additions & 3 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributors: constantcontact, webdevstudios, tw2113, znowebdev, ggwicz, ra
Tags: capture, contacts, constant contact, constant contact form, constant contact newsletter, constant contact official, contact forms, email, form, forms, marketing, mobile, newsletter, opt-in, plugin, signup, subscribe, subscription, widget
Requires at least: 5.2.0
Tested up to: 5.4.1
Stable tag: 1.8.4
Stable tag: 1.8.5
License: GPLv3
License URI: http://www.gnu.org/licenses/gpl-3.0.html
Requires PHP: 5.6
Expand Down Expand Up @@ -35,11 +35,10 @@ BONUS: If you have a Constant Contact account, all new email addresses that you

== Changelog ==

= NEXT =
= 1.8.5 =
* Added: Forced email notifications to admin when Constant Contact API request fails on attempted form submission.
* Fixed: Addressed issues with plugin error logging and addressed false-positive error messaging.
* Fixed: Cleaned up style minification task to allow for unminified version of stylesheet.
* Updated: Replaced usage of non-unique IDs on frontend form elements with classes.
* Updated: Updated support error messaging in admin to reference tab structure of plugin settings.

= 1.8.4 =
Expand Down

0 comments on commit 8f8da1a

Please sign in to comment.