Completed
Branch 3.0 (864fc8)
by Stephanie
02:53
created
classes/models/FrmSettings.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,7 +48,8 @@  discard block
 block discarded – undo
48 48
     }
49 49
 
50 50
 	private function translate_settings( $settings ) {
51
-        if ( $settings ) { //workaround for W3 total cache conflict
51
+        if ( $settings ) {
52
+//workaround for W3 total cache conflict
52 53
             return unserialize(serialize($settings));
53 54
         }
54 55
 
@@ -59,7 +60,8 @@  discard block
 block discarded – undo
59 60
         }
60 61
 
61 62
         // If unserializing didn't work
62
-        if ( $settings ) { //workaround for W3 total cache conflict
63
+        if ( $settings ) {
64
+//workaround for W3 total cache conflict
63 65
             $settings = unserialize(serialize($settings));
64 66
         } else {
65 67
             $settings = $this;
Please login to merge, or discard this patch.
classes/controllers/FrmFormsController.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1082,7 +1082,8 @@
 block discarded – undo
1082 1082
 	private static function maybe_get_form_to_show( $id ) {
1083 1083
 		$form = false;
1084 1084
 
1085
-		if ( ! empty( $id ) ) { // no form id or key set
1085
+		if ( ! empty( $id ) ) {
1086
+// no form id or key set
1086 1087
 			$form = FrmForm::getOne( $id );
1087 1088
 			if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
1088 1089
 				$form = false;
Please login to merge, or discard this patch.
classes/views/frm-fields/back-end/html-content.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 		<textarea name="field_options[description_<?php echo absint( $field['id'] ) ?>]" class="frm_98_width" rows="8"><?php
4 4
 	if ( FrmField::is_option_true( $field, 'stop_filter' ) ) {
5 5
 		echo $field['description'];
6
-	} else{
6
+	} else {
7 7
 		echo FrmAppHelper::esc_textarea( $field['description'] );
8 8
 	}
9 9
 	?></textarea>
Please login to merge, or discard this patch.