|
@@ -145,8 +145,8 @@ discard block |
|
|
block discarded – undo |
|
145
|
145
|
$settings = $this->default_options(); |
|
146
|
146
|
|
|
147
|
147
|
foreach ( $settings as $setting => $default ) { |
|
148
|
|
- if ( isset( $params[ 'frm_' . $setting ] ) ) { |
|
149
|
|
- $this->{$setting} = $params[ 'frm_' . $setting ]; |
|
|
148
|
+ if ( isset( $params['frm_' . $setting] ) ) { |
|
|
149
|
+ $this->{$setting} = $params['frm_' . $setting]; |
|
150
|
150
|
} elseif ( ! isset( $this->{$setting} ) ) { |
|
151
|
151
|
$this->{$setting} = $default; |
|
152
|
152
|
} |
|
@@ -251,7 +251,7 @@ discard block |
|
|
block discarded – undo |
|
251
|
251
|
|
|
252
|
252
|
$checkboxes = array( 'mu_menu', 're_multi', 'use_html', 'jquery_css', 'accordion_js', 'fade_form', 'old_css', 'no_ips', 'tracking', 'admin_bar' ); |
|
253
|
253
|
foreach ( $checkboxes as $set ) { |
|
254
|
|
- $this->$set = isset( $params[ 'frm_' . $set ] ) ? $params[ 'frm_' . $set ] : 0; |
|
|
254
|
+ $this->$set = isset( $params['frm_' . $set] ) ? $params['frm_' . $set] : 0; |
|
255
|
255
|
} |
|
256
|
256
|
} |
|
257
|
257
|
|
|
@@ -261,7 +261,7 @@ discard block |
|
|
block discarded – undo |
|
261
|
261
|
$frm_roles = FrmAppHelper::frm_capabilities(); |
|
262
|
262
|
$roles = get_editable_roles(); |
|
263
|
263
|
foreach ( $frm_roles as $frm_role => $frm_role_description ) { |
|
264
|
|
- $this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' ); |
|
|
264
|
+ $this->$frm_role = (array) ( isset( $params[$frm_role] ) ? $params[$frm_role] : 'administrator' ); |
|
265
|
265
|
|
|
266
|
266
|
// Make sure administrators always have permissions |
|
267
|
267
|
if ( ! in_array( 'administrator', $this->$frm_role ) ) { |