Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 2 deletions classes/controllers/FrmSettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,10 @@ public static function general_settings() {
* Render the global currency selector if Pro is up to date.
*
* @param FrmSettings $frm_settings
* @param string $more_html
*
* @return void
*/
public static function maybe_render_currency_selector( $frm_settings, $more_html ) {
public static function maybe_render_currency_selector( $frm_settings ) {
if ( is_callable( 'FrmProSettingsController::add_currency_settings' ) ) {
FrmProSettingsController::add_currency_settings();
return;
Expand Down
8 changes: 1 addition & 7 deletions classes/views/frm-settings/general.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,14 @@
</p>

<?php
ob_start();

/**
* Trigger an action so Pro can display additional General settings in the Other section.
*
* @param FrmSettings $frm_settings
*/
do_action( 'frm_settings_form', $frm_settings );

$more_html = ob_get_clean();
echo $more_html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped

FrmSettingsController::maybe_render_currency_selector( $frm_settings, $more_html );
unset( $more_html );
FrmSettingsController::maybe_render_currency_selector( $frm_settings );
?>

<div class="clear"></div>
Expand Down
Loading