|
@@ -239,8 +239,8 @@ discard block |
|
|
block discarded – undo |
|
239
|
239
|
} |
|
240
|
240
|
|
|
241
|
241
|
foreach ( $settings as $setting => $default ) { |
|
242
|
|
- if ( isset( $params[ 'frm_' . $setting ] ) ) { |
|
243
|
|
- $this->{$setting} = $params[ 'frm_' . $setting ]; |
|
|
242
|
+ if ( isset( $params['frm_' . $setting] ) ) { |
|
|
243
|
+ $this->{$setting} = $params['frm_' . $setting]; |
|
244
|
244
|
} elseif ( ! isset( $this->{$setting} ) ) { |
|
245
|
245
|
$this->{$setting} = $default; |
|
246
|
246
|
} |
|
@@ -432,7 +432,7 @@ discard block |
|
|
block discarded – undo |
|
432
|
432
|
'denylist_check', |
|
433
|
433
|
); |
|
434
|
434
|
foreach ( $checkboxes as $set ) { |
|
435
|
|
- $this->$set = isset( $params[ 'frm_' . $set ] ) ? absint( $params[ 'frm_' . $set ] ) : 0; |
|
|
435
|
+ $this->$set = isset( $params['frm_' . $set] ) ? absint( $params['frm_' . $set] ) : 0; |
|
436
|
436
|
} |
|
437
|
437
|
} |
|
438
|
438
|
|
|
@@ -445,7 +445,7 @@ discard block |
|
|
block discarded – undo |
|
445
|
445
|
$frm_roles = FrmAppHelper::frm_capabilities(); |
|
446
|
446
|
$roles = get_editable_roles(); |
|
447
|
447
|
foreach ( $frm_roles as $frm_role => $frm_role_description ) { |
|
448
|
|
- $this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' ); |
|
|
448
|
+ $this->$frm_role = (array) ( isset( $params[$frm_role] ) ? $params[$frm_role] : 'administrator' ); |
|
449
|
449
|
|
|
450
|
450
|
// Make sure administrators always have permissions |
|
451
|
451
|
if ( ! in_array( 'administrator', $this->$frm_role, true ) ) { |
Please login to merge, or discard this patch.