|
@@ -92,7 +92,7 @@ discard block |
|
|
block discarded – undo |
|
92
|
92
|
} |
|
93
|
93
|
|
|
94
|
94
|
public function __destruct() { |
|
95
|
|
- remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback );; |
|
|
95
|
+ remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback ); ; |
|
96
|
96
|
} |
|
97
|
97
|
|
|
98
|
98
|
/** |
|
@@ -175,55 +175,55 @@ discard block |
|
|
block discarded – undo |
|
175
|
175
|
|
|
176
|
176
|
if ( $is_view && $post ) { |
|
177
|
177
|
if ( $field_type ) { |
|
178
|
|
- $specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name ); |
|
179
|
|
- $inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name ); |
|
180
|
|
- $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type ); |
|
181
|
|
- $inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType ); |
|
182
|
|
- $specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name ); |
|
183
|
|
- $inputType && $specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name ); |
|
184
|
|
- $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type ); |
|
185
|
|
- $inputType && $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType ); |
|
|
178
|
+ $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name ); |
|
|
179
|
+ $inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name ); |
|
|
180
|
+ $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type ); |
|
|
181
|
+ $inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType ); |
|
|
182
|
+ $specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name ); |
|
|
183
|
+ $inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name ); |
|
|
184
|
+ $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type ); |
|
|
185
|
+ $inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType ); |
|
186
|
186
|
} |
|
187
|
187
|
|
|
188
|
|
- $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name ); |
|
189
|
|
- $specifics []= sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id ); |
|
190
|
|
- $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name ); |
|
191
|
|
- $specifics []= sprintf( '%spost-%d-field.php', $slug_dir, $post->ID ); |
|
|
188
|
+ $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name ); |
|
|
189
|
+ $specifics [ ] = sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id ); |
|
|
190
|
+ $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name ); |
|
|
191
|
+ $specifics [ ] = sprintf( '%spost-%d-field.php', $slug_dir, $post->ID ); |
|
192
|
192
|
} |
|
193
|
193
|
|
|
194
|
194
|
/** Field-specific */ |
|
195
|
195
|
if ( $field_id && $form_id ) { |
|
196
|
196
|
|
|
197
|
197
|
if ( $field_id ) { |
|
198
|
|
- $specifics []= sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name ); |
|
199
|
|
- $specifics []= sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id ); |
|
|
198
|
+ $specifics [ ] = sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name ); |
|
|
199
|
+ $specifics [ ] = sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id ); |
|
200
|
200
|
} |
|
201
|
201
|
|
|
202
|
202
|
if ( $field_type ) { |
|
203
|
|
- $specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name ); |
|
204
|
|
- $inputType && $specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name ); |
|
205
|
|
- $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type ); |
|
206
|
|
- $inputType && $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType ); |
|
207
|
|
- |
|
208
|
|
- $specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name ); |
|
209
|
|
- $inputType && $specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name ); |
|
210
|
|
- $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type ); |
|
211
|
|
- $inputType && $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType ); |
|
212
|
|
- |
|
213
|
|
- $specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name ); |
|
214
|
|
- $inputType && $specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name ); |
|
215
|
|
- $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $field_type ); |
|
216
|
|
- $inputType && $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $inputType ); |
|
|
203
|
+ $specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name ); |
|
|
204
|
+ $inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name ); |
|
|
205
|
+ $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type ); |
|
|
206
|
+ $inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType ); |
|
|
207
|
+ |
|
|
208
|
+ $specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name ); |
|
|
209
|
+ $inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name ); |
|
|
210
|
+ $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type ); |
|
|
211
|
+ $inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType ); |
|
|
212
|
+ |
|
|
213
|
+ $specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name ); |
|
|
214
|
+ $inputType && $specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name ); |
|
|
215
|
+ $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $field_type ); |
|
|
216
|
+ $inputType && $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $inputType ); |
|
217
|
217
|
} |
|
218
|
218
|
} |
|
219
|
219
|
|
|
220
|
220
|
if ( $form_id ) { |
|
221
|
221
|
/** Generic field templates */ |
|
222
|
|
- $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name ); |
|
223
|
|
- $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name ); |
|
|
222
|
+ $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name ); |
|
|
223
|
+ $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name ); |
|
224
|
224
|
|
|
225
|
|
- $specifics []= sprintf( '%sview-%d-field.php', $slug_dir, $view_id ); |
|
226
|
|
- $specifics []= sprintf( '%sform-%d-field.php', $slug_dir, $form_id ); |
|
|
225
|
+ $specifics [ ] = sprintf( '%sview-%d-field.php', $slug_dir, $view_id ); |
|
|
226
|
+ $specifics [ ] = sprintf( '%sform-%d-field.php', $slug_dir, $form_id ); |
|
227
|
227
|
} |
|
228
|
228
|
|
|
229
|
229
|
/** |
|
@@ -231,12 +231,12 @@ discard block |
|
|
block discarded – undo |
|
231
|
231
|
* Ignore some types that conflict. |
|
232
|
232
|
*/ |
|
233
|
233
|
if ( ! in_array( $field_type, array( 'notes' ) ) ) { |
|
234
|
|
- $specifics []= sprintf( '%s.php', $field_type ); |
|
235
|
|
- $specifics []= sprintf( 'fields/%s.php', $field_type ); |
|
|
234
|
+ $specifics [ ] = sprintf( '%s.php', $field_type ); |
|
|
235
|
+ $specifics [ ] = sprintf( 'fields/%s.php', $field_type ); |
|
236
|
236
|
} |
|
237
|
237
|
|
|
238
|
|
- $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $slug_name ); |
|
239
|
|
- $specifics []= sprintf( '%sfield.php', $slug_dir ); |
|
|
238
|
+ $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $slug_name ); |
|
|
239
|
+ $specifics [ ] = sprintf( '%sfield.php', $slug_dir ); |
|
240
|
240
|
|
|
241
|
241
|
return array_merge( $specifics, $templates ); |
|
242
|
242
|
}; |
|
@@ -266,7 +266,7 @@ discard block |
|
|
block discarded – undo |
|
266
|
266
|
/** Prevent any PHP warnings that may be generated. */ |
|
267
|
267
|
ob_start(); |
|
268
|
268
|
|
|
269
|
|
- $display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $this->entry['currency'], false, 'html' ); |
|
|
269
|
+ $display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $this->entry[ 'currency' ], false, 'html' ); |
|
270
|
270
|
|
|
271
|
271
|
if ( $errors = ob_get_clean() ) { |
|
272
|
272
|
gravityview()->log->error( 'Errors when calling GFCommon::get_lead_field_display()', array( 'data' => $errors ) ); |
gravityview /
GravityView
