diff --git a/classes/models/FrmSettings.php b/classes/models/FrmSettings.php index 77d2c4e311..2469d53510 100644 --- a/classes/models/FrmSettings.php +++ b/classes/models/FrmSettings.php @@ -8,11 +8,7 @@ class FrmSettings { public $option_name = 'frm_options'; public $menu; public $mu_menu; - public $use_html; - public $jquery_css; - public $accordion_js; public $fade_form; - public $old_css; public $admin_bar; public $success_msg; @@ -136,11 +132,7 @@ public function default_options() { return array( 'menu' => apply_filters( 'frm_default_menu', 'Formidable' ), 'mu_menu' => 0, - 'use_html' => true, - 'jquery_css' => false, - 'accordion_js' => false, 'fade_form' => false, - 'old_css' => false, 'admin_bar' => false, 're_multi' => 1, @@ -406,7 +398,7 @@ private function update_settings( $params ) { $this->from_email = $params['frm_from_email']; $this->currency = $params['frm_currency']; - $checkboxes = array( 'mu_menu', 're_multi', 'use_html', 'jquery_css', 'accordion_js', 'fade_form', 'no_ips', 'custom_header_ip', 'tracking', 'admin_bar', 'summary_emails' ); + $checkboxes = array( 'mu_menu', 're_multi', 'fade_form', 'no_ips', 'custom_header_ip', 'tracking', 'admin_bar', 'summary_emails' ); foreach ( $checkboxes as $set ) { $this->$set = isset( $params[ 'frm_' . $set ] ) ? absint( $params[ 'frm_' . $set ] ) : 0; } diff --git a/classes/models/FrmUsage.php b/classes/models/FrmUsage.php index 55a946953c..ba3c0b7872 100644 --- a/classes/models/FrmUsage.php +++ b/classes/models/FrmUsage.php @@ -197,9 +197,7 @@ private function settings() { ); $pass_settings = array( 'load_style', - 'use_html', 'fade_form', - 'jquery_css', 're_type', 're_lang', 're_multi', @@ -375,7 +373,7 @@ private function forms() { private function form_field_count( $form_id ) { global $wpdb; - $join = $wpdb->prefix . 'frm_fields fi LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fo ON (fi.form_id=fo.id)'; + $join = $wpdb->prefix . 'frm_fields fi JOIN ' . $wpdb->prefix . 'frm_forms fo ON (fi.form_id=fo.id)'; $field_query = array( 'or' => 1, diff --git a/classes/views/frm-settings/misc.php b/classes/views/frm-settings/misc.php index 7b1ff1d788..2ce4083933 100644 --- a/classes/views/frm-settings/misc.php +++ b/classes/views/frm-settings/misc.php @@ -41,16 +41,6 @@

- - -