-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #485 from WebDevStudios/chore/prep-release-1.8.5
Chore/prep release 1.8.5
- Loading branch information
Showing
10 changed files
with
42 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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'; | ||
|
@@ -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. | ||
*/ | ||
|
@@ -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 | ||
*/ | ||
|
@@ -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 ); | ||
|
@@ -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 | ||
*/ | ||
|
@@ -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(); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
|
@@ -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 | ||
*/ | ||
|
@@ -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 ) { | ||
|
@@ -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. | ||
|
@@ -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. | ||
*/ | ||
|
@@ -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. | ||
|
@@ -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. | ||
*/ | ||
|
@@ -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. | ||
|
@@ -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. | ||
|
@@ -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' ) ); | ||
|
@@ -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' ) ); | ||
|
@@ -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' ) ); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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(); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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. | ||
|
@@ -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. | ||
|
@@ -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. | ||
|
@@ -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 | ||
|
@@ -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 | ||
|
@@ -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. | ||
*/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters