Skip to content

Remove buttons settings tab #2115

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

Merged
Crabcyborg merged 7 commits into from
Nov 26, 2024
Merged

Remove buttons settings tab #2115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
77a8789
Remove buttons settings tab
truongwp Nov 18, 2024
43aee7a
Deprecate Buttons hooks if Pro isn't installed
truongwp Nov 20, 2024
1a2e032
Merge branch 'master' into remove-buttons-settings
Crabcyborg Nov 20, 2024
87feb72
Merge branch 'master' into remove-buttons-settings
Crabcyborg Nov 20, 2024
efc4023
Fix fatal error with do_action_deprecated()
truongwp Nov 22, 2024
6c2cd1b
Update settings-buttons.php
truongwp Nov 26, 2024
1eb0eaf
Update version numbers
Crabcyborg Nov 26, 2024
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
4 changes: 4 additions & 0 deletions classes/controllers/FrmFormsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,6 +1413,10 @@ private static function get_settings_tabs( $values ) {
),
);

if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
unset( $sections['buttons'] );
}

foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
unset( $sections[ $feature ] );
Expand Down
19 changes: 17 additions & 2 deletions classes/views/frm-forms/settings-buttons.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,20 @@
if ( ! defined( 'ABSPATH' ) ) {
die( 'You are not allowed to call this page directly.' );
}

// Do not deprecate if the Pro version still use these hooks.
$should_deprecate_hook = ! class_exists( 'FrmProDb' ) || version_compare( FrmProDb::$plug_version, '6.16.3' ) >= 0;
?>
<input type="hidden" name="options[custom_style]" value="<?php echo esc_attr( $values['custom_style'] ); ?>" />

<table class="form-table">
<?php do_action( 'frm_add_form_style_tab_options', $values ); ?>
<?php
if ( $should_deprecate_hook ) {
do_action_deprecated( 'frm_add_form_style_tab_options', array( $values ), '6.16.3' );
} else {
do_action( 'frm_add_form_style_tab_options', $values );
}
?>
<tr>
<td colspan="2">
<h3><?php esc_html_e( 'Buttons', 'formidable' ); ?></h3>
Expand All @@ -19,5 +28,11 @@
</div>
</td>
</tr>
<?php do_action( 'frm_add_form_button_options', $values ); ?>
<?php
if ( $should_deprecate_hook ) {
do_action_deprecated( 'frm_add_form_button_options', array( $values ), '6.16.3' );
} else {
do_action( 'frm_add_form_button_options', $values );
}
?>
</table>