|
@@ -155,59 +155,59 @@ discard block |
|
|
block discarded – undo |
|
155
|
155
|
|
|
156
|
156
|
if ( $this->request && $this->request->is_view() && $post ) { |
|
157
|
157
|
if ( $this->field && $field_type ) { |
|
158
|
|
- $specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name ); |
|
159
|
|
- $inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name ); |
|
160
|
|
- $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type ); |
|
161
|
|
- $inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType ); |
|
162
|
|
- $specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name ); |
|
163
|
|
- $inputType && $specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name ); |
|
164
|
|
- $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type ); |
|
165
|
|
- $inputType && $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType ); |
|
|
158
|
+ $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name ); |
|
|
159
|
+ $inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name ); |
|
|
160
|
+ $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type ); |
|
|
161
|
+ $inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType ); |
|
|
162
|
+ $specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name ); |
|
|
163
|
+ $inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name ); |
|
|
164
|
+ $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type ); |
|
|
165
|
+ $inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType ); |
|
166
|
166
|
} |
|
167
|
167
|
|
|
168
|
|
- $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name ); |
|
169
|
|
- $specifics []= sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id ); |
|
170
|
|
- $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name ); |
|
171
|
|
- $specifics []= sprintf( '%spost-%d-field.php', $slug_dir, $post->ID ); |
|
|
168
|
+ $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name ); |
|
|
169
|
+ $specifics [ ] = sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id ); |
|
|
170
|
+ $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name ); |
|
|
171
|
+ $specifics [ ] = sprintf( '%spost-%d-field.php', $slug_dir, $post->ID ); |
|
172
|
172
|
} |
|
173
|
173
|
|
|
174
|
174
|
/** Field-specific */ |
|
175
|
175
|
if ( $this->field && $this->view ) { |
|
176
|
176
|
|
|
177
|
177
|
if ( $this->field->ID ) { |
|
178
|
|
- $specifics []= sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $this->view->form->ID, $this->field->ID, $slug_name ); |
|
179
|
|
- $specifics []= sprintf( '%sform-%d-field-%d.php', $slug_dir, $this->view->form->ID, $this->field->ID ); |
|
|
178
|
+ $specifics [ ] = sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $this->view->form->ID, $this->field->ID, $slug_name ); |
|
|
179
|
+ $specifics [ ] = sprintf( '%sform-%d-field-%d.php', $slug_dir, $this->view->form->ID, $this->field->ID ); |
|
180
|
180
|
} |
|
181
|
181
|
|
|
182
|
182
|
if ( $field_type ) { |
|
183
|
|
- $specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $this->view->form->ID, $field_type, $slug_name ); |
|
184
|
|
- $inputType && $specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $this->view->form->ID, $inputType, $slug_name ); |
|
185
|
|
- $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $this->view->form->ID, $field_type ); |
|
186
|
|
- $inputType && $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $this->view->form->ID, $inputType ); |
|
187
|
|
- |
|
188
|
|
- $specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name ); |
|
189
|
|
- $inputType && $specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name ); |
|
190
|
|
- $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type ); |
|
191
|
|
- $inputType && $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType ); |
|
192
|
|
- |
|
193
|
|
- $specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name ); |
|
194
|
|
- $inputType && $specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name ); |
|
195
|
|
- $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $field_type ); |
|
196
|
|
- $inputType && $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $inputType ); |
|
|
183
|
+ $specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $this->view->form->ID, $field_type, $slug_name ); |
|
|
184
|
+ $inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $this->view->form->ID, $inputType, $slug_name ); |
|
|
185
|
+ $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $this->view->form->ID, $field_type ); |
|
|
186
|
+ $inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $this->view->form->ID, $inputType ); |
|
|
187
|
+ |
|
|
188
|
+ $specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name ); |
|
|
189
|
+ $inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name ); |
|
|
190
|
+ $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type ); |
|
|
191
|
+ $inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType ); |
|
|
192
|
+ |
|
|
193
|
+ $specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name ); |
|
|
194
|
+ $inputType && $specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name ); |
|
|
195
|
+ $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $field_type ); |
|
|
196
|
+ $inputType && $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $inputType ); |
|
197
|
197
|
} |
|
198
|
198
|
} |
|
199
|
199
|
|
|
200
|
200
|
if ( $this->view ) { |
|
201
|
201
|
/** Generic field templates */ |
|
202
|
|
- $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name ); |
|
203
|
|
- $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $this->view->form->ID, $slug_name ); |
|
|
202
|
+ $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name ); |
|
|
203
|
+ $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $this->view->form->ID, $slug_name ); |
|
204
|
204
|
|
|
205
|
|
- $specifics []= sprintf( '%sview-%d-field.php', $slug_dir, $view_id ); |
|
206
|
|
- $specifics []= sprintf( '%sform-%d-field.php', $slug_dir, $this->view->form->ID ); |
|
|
205
|
+ $specifics [ ] = sprintf( '%sview-%d-field.php', $slug_dir, $view_id ); |
|
|
206
|
+ $specifics [ ] = sprintf( '%sform-%d-field.php', $slug_dir, $this->view->form->ID ); |
|
207
|
207
|
} |
|
208
|
208
|
|
|
209
|
|
- $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $slug_name ); |
|
210
|
|
- $specifics []= sprintf( '%sfield.php', $slug_dir ); |
|
|
209
|
+ $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $slug_name ); |
|
|
210
|
+ $specifics [ ] = sprintf( '%sfield.php', $slug_dir ); |
|
211
|
211
|
|
|
212
|
212
|
|
|
213
|
213
|
return array_merge( $specifics, $templates ); |
|
@@ -233,7 +233,7 @@ discard block |
|
|
block discarded – undo |
|
233
|
233
|
/** Prevent any PHP warnings that may be generated. */ |
|
234
|
234
|
ob_start(); |
|
235
|
235
|
|
|
236
|
|
- $display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $this->entry['currency'], false, 'html' ); |
|
|
236
|
+ $display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $this->entry[ 'currency' ], false, 'html' ); |
|
237
|
237
|
|
|
238
|
238
|
if ( $errors = ob_get_clean() ) { |
|
239
|
239
|
gravityview()->log->error( 'Errors when calling GFCommon::get_lead_field_display()', array( 'data' => $errors ) ); |