@@ -79,8 +79,9 @@ |
||
| 79 | 79 | * Check permissions. |
| 80 | 80 | */ |
| 81 | 81 | while ( $error = $view->can_render( array( 'shortcode' ), $request ) ) { |
| 82 | - if ( ! is_wp_error( $error ) ) |
|
| 83 | - break; |
|
| 82 | + if ( ! is_wp_error( $error ) ) { |
|
| 83 | + break; |
|
| 84 | + } |
|
| 84 | 85 | |
| 85 | 86 | switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) { |
| 86 | 87 | case 'post_password_required': |
@@ -43,8 +43,8 @@ discard block |
||
| 43 | 43 | 'class' => '', |
| 44 | 44 | ) ); |
| 45 | 45 | |
| 46 | - if ( ! $view_id = $atts['id'] ? : $atts['view_id'] ) { |
|
| 47 | - if ( $atts['detail'] && $view = $request->is_view() ) { |
|
| 46 | + if ( ! $view_id = $atts[ 'id' ] ?: $atts[ 'view_id' ] ) { |
|
| 47 | + if ( $atts[ 'detail' ] && $view = $request->is_view() ) { |
|
| 48 | 48 | $view_id = $view->ID; |
| 49 | 49 | } |
| 50 | 50 | } |
@@ -132,12 +132,12 @@ discard block |
||
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
| 135 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
| 136 | 136 | |
| 137 | 137 | /** |
| 138 | 138 | * View details. |
| 139 | 139 | */ |
| 140 | - if ( $atts['detail'] ) { |
|
| 140 | + if ( $atts[ 'detail' ] ) { |
|
| 141 | 141 | $entries = $view->get_entries( $request ); |
| 142 | 142 | return self::_return( $this->detail( $view, $entries, $atts ) ); |
| 143 | 143 | |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | return self::_return( '' ); |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - if ( $entry['status'] != 'active' ) { |
|
| 157 | + if ( $entry[ 'status' ] != 'active' ) { |
|
| 158 | 158 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
| 159 | 159 | return self::_return( __( 'You are not allowed to view this content.', 'gk-gravityview' ) ); |
| 160 | 160 | } |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 168 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 168 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 169 | 169 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
| 170 | 170 | return self::_return( __( 'You are not allowed to view this content.', 'gk-gravityview' ) ); |
| 171 | 171 | } |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | $entryset = $entry->is_multi() ? $entry->entries : array( $entry ); |
| 189 | 189 | |
| 190 | 190 | foreach ( $entryset as $e ) { |
| 191 | - if ( $e['status'] != 'active' ) { |
|
| 191 | + if ( $e[ 'status' ] != 'active' ) { |
|
| 192 | 192 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) ); |
| 193 | 193 | return self::_return( __( 'You are not allowed to view this content.', 'gk-gravityview' ) ); |
| 194 | 194 | } |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 202 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 202 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 203 | 203 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) ); |
| 204 | 204 | return self::_return( __( 'You are not allowed to view this content.', 'gk-gravityview' ) ); |
| 205 | 205 | } |
@@ -224,10 +224,10 @@ discard block |
||
| 224 | 224 | |
| 225 | 225 | // Mock the request with the actual View, not the global one |
| 226 | 226 | $mock_request = new \GV\Mock_Request(); |
| 227 | - $mock_request->returns['is_view'] = $view; |
|
| 228 | - $mock_request->returns['is_entry'] = $request->is_entry( $view->form ? $view->form->ID : 0 ); |
|
| 229 | - $mock_request->returns['is_edit_entry'] = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ); |
|
| 230 | - $mock_request->returns['is_search'] = $request->is_search(); |
|
| 227 | + $mock_request->returns[ 'is_view' ] = $view; |
|
| 228 | + $mock_request->returns[ 'is_entry' ] = $request->is_entry( $view->form ? $view->form->ID : 0 ); |
|
| 229 | + $mock_request->returns[ 'is_edit_entry' ] = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ); |
|
| 230 | + $mock_request->returns[ 'is_search' ] = $request->is_search(); |
|
| 231 | 231 | |
| 232 | 232 | $request = $mock_request; |
| 233 | 233 | } |
@@ -263,16 +263,16 @@ discard block |
||
| 263 | 263 | $filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' ); |
| 264 | 264 | |
| 265 | 265 | // Only keep the passed attributes after making sure that they're valid pairs |
| 266 | - $filtered_atts = array_intersect_key( (array) $passed_atts, $filtered_atts ); |
|
| 266 | + $filtered_atts = array_intersect_key( (array)$passed_atts, $filtered_atts ); |
|
| 267 | 267 | |
| 268 | 268 | $atts = array(); |
| 269 | 269 | |
| 270 | - foreach( $filtered_atts as $key => $passed_value ) { |
|
| 270 | + foreach ( $filtered_atts as $key => $passed_value ) { |
|
| 271 | 271 | |
| 272 | 272 | // Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by} |
| 273 | 273 | $passed_value = \GravityView_Merge_Tags::replace_variables( $passed_value ); |
| 274 | 274 | |
| 275 | - switch( $defaults[ $key ]['type'] ) { |
|
| 275 | + switch ( $defaults[ $key ][ 'type' ] ) { |
|
| 276 | 276 | |
| 277 | 277 | /** |
| 278 | 278 | * Make sure number fields are numeric. |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | * @see http://php.net/manual/en/function.is-numeric.php#107326 |
| 281 | 281 | */ |
| 282 | 282 | case 'number': |
| 283 | - if( is_numeric( $passed_value ) ) { |
|
| 283 | + if ( is_numeric( $passed_value ) ) { |
|
| 284 | 284 | $atts[ $key ] = ( $passed_value + 0 ); |
| 285 | 285 | } |
| 286 | 286 | break; |
@@ -295,8 +295,8 @@ discard block |
||
| 295 | 295 | */ |
| 296 | 296 | case 'select': |
| 297 | 297 | case 'radio': |
| 298 | - $options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options']; |
|
| 299 | - if( in_array( $passed_value, array_keys( $options ) ) ) { |
|
| 298 | + $options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ]; |
|
| 299 | + if ( in_array( $passed_value, array_keys( $options ) ) ) { |
|
| 300 | 300 | $atts[ $key ] = $passed_value; |
| 301 | 301 | } |
| 302 | 302 | break; |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | } |
| 309 | 309 | } |
| 310 | 310 | |
| 311 | - $atts['detail'] = \GV\Utils::get( $passed_atts, 'detail', null ); |
|
| 311 | + $atts[ 'detail' ] = \GV\Utils::get( $passed_atts, 'detail', null ); |
|
| 312 | 312 | |
| 313 | 313 | return $atts; |
| 314 | 314 | } |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | private function detail( $view, $entries, $atts ) { |
| 326 | 326 | $output = ''; |
| 327 | 327 | |
| 328 | - switch ( $key = $atts['detail'] ): |
|
| 328 | + switch ( $key = $atts[ 'detail' ] ): |
|
| 329 | 329 | case 'total_entries': |
| 330 | 330 | $output = number_format_i18n( $entries->total() ); |
| 331 | 331 | break; |
@@ -48,8 +48,8 @@ discard block |
||
| 48 | 48 | gravityview()->log->debug( '$passed_atts: ', array( 'data' => $passed_atts ) ); |
| 49 | 49 | |
| 50 | 50 | // Get details about the current View |
| 51 | - if( !empty( $passed_atts['detail'] ) ) { |
|
| 52 | - return $this->get_view_detail( $passed_atts['detail'] ); |
|
| 51 | + if ( ! empty( $passed_atts[ 'detail' ] ) ) { |
|
| 52 | + return $this->get_view_detail( $passed_atts[ 'detail' ] ); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | $atts = $this->parse_and_sanitize_atts( $passed_atts ); |
@@ -85,16 +85,16 @@ discard block |
||
| 85 | 85 | $filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' ); |
| 86 | 86 | |
| 87 | 87 | // Only keep the passed attributes after making sure that they're valid pairs |
| 88 | - $filtered_atts = array_intersect_key( (array) $passed_atts, $filtered_atts ); |
|
| 88 | + $filtered_atts = array_intersect_key( (array)$passed_atts, $filtered_atts ); |
|
| 89 | 89 | |
| 90 | 90 | $atts = array(); |
| 91 | 91 | |
| 92 | - foreach( $filtered_atts as $key => $passed_value ) { |
|
| 92 | + foreach ( $filtered_atts as $key => $passed_value ) { |
|
| 93 | 93 | |
| 94 | 94 | // Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by} |
| 95 | 95 | $passed_value = GravityView_Merge_Tags::replace_variables( $passed_value ); |
| 96 | 96 | |
| 97 | - switch( $defaults[ $key ]['type'] ) { |
|
| 97 | + switch ( $defaults[ $key ][ 'type' ] ) { |
|
| 98 | 98 | |
| 99 | 99 | /** |
| 100 | 100 | * Make sure number fields are numeric. |
@@ -102,14 +102,14 @@ discard block |
||
| 102 | 102 | * @see http://php.net/manual/en/function.is-numeric.php#107326 |
| 103 | 103 | */ |
| 104 | 104 | case 'number': |
| 105 | - if( is_numeric( $passed_value ) ) { |
|
| 105 | + if ( is_numeric( $passed_value ) ) { |
|
| 106 | 106 | $atts[ $key ] = ( $passed_value + 0 ); |
| 107 | 107 | } |
| 108 | 108 | break; |
| 109 | 109 | |
| 110 | 110 | /** @since 2.1 */ |
| 111 | 111 | case 'operator': |
| 112 | - if( GFFormsModel::is_valid_operator( $passed_value ) ) { |
|
| 112 | + if ( GFFormsModel::is_valid_operator( $passed_value ) ) { |
|
| 113 | 113 | $atts[ $key ] = $passed_value; |
| 114 | 114 | } |
| 115 | 115 | break; |
@@ -124,8 +124,8 @@ discard block |
||
| 124 | 124 | */ |
| 125 | 125 | case 'select': |
| 126 | 126 | case 'radio': |
| 127 | - $options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options']; |
|
| 128 | - if( in_array( $passed_value, array_keys( $options ) ) ) { |
|
| 127 | + $options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ]; |
|
| 128 | + if ( in_array( $passed_value, array_keys( $options ) ) ) { |
|
| 129 | 129 | $atts[ $key ] = $passed_value; |
| 130 | 130 | } |
| 131 | 131 | break; |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | $gravityview_view = GravityView_View::getInstance(); |
| 155 | 155 | $return = ''; |
| 156 | 156 | |
| 157 | - switch( $detail ) { |
|
| 157 | + switch ( $detail ) { |
|
| 158 | 158 | case 'total_entries': |
| 159 | 159 | $return = number_format_i18n( $gravityview_view->getTotalEntries() ); |
| 160 | 160 | break; |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | abstract class GravityView_Extension extends \GV\Extension { |
| 16 | 16 | public function __construct() { |
| 17 | - if( ! in_array( $this->_author, array( 'GravityView', 'Katz Web Services, Inc.', true ) ) ) { |
|
| 17 | + if ( ! in_array( $this->_author, array( 'GravityView', 'Katz Web Services, Inc.', true ) ) ) { |
|
| 18 | 18 | gravityview()->log->warning( '\GravityView_Extension is deprecated. Inherit from \GV\Extension instead', array( 'data' => $this ) ); |
| 19 | 19 | } |
| 20 | 20 | parent::__construct(); |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | $gv_page = gravityview()->request->is_admin( '', 'single' ); |
| 79 | 79 | |
| 80 | 80 | // New View or Edit View page |
| 81 | - if( $gv_page && $pagenow === 'post-new.php' ) { |
|
| 81 | + if ( $gv_page && $pagenow === 'post-new.php' ) { |
|
| 82 | 82 | remove_meta_box( 'woothemes-settings', 'gravityview', 'normal' ); |
| 83 | 83 | } |
| 84 | 84 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | parent::add_hooks(); |
| 69 | 69 | |
| 70 | - if( gravityview()->request->is_admin( '', null ) ) { |
|
| 70 | + if ( gravityview()->request->is_admin( '', null ) ) { |
|
| 71 | 71 | |
| 72 | 72 | // Make Yoast metabox go down to the bottom please. |
| 73 | 73 | add_filter( 'wpseo_metabox_prio', array( $this, 'return_low' ) ); |
@@ -92,8 +92,8 @@ discard block |
||
| 92 | 92 | */ |
| 93 | 93 | public function disable_content_analysis( $options ) { |
| 94 | 94 | |
| 95 | - $options['keyword_analysis_active'] = false; |
|
| 96 | - $options['content_analysis_active'] = false; |
|
| 95 | + $options[ 'keyword_analysis_active' ] = false; |
|
| 96 | + $options[ 'content_analysis_active' ] = false; |
|
| 97 | 97 | |
| 98 | 98 | return $options; |
| 99 | 99 | } |
@@ -112,8 +112,8 @@ discard block |
||
| 112 | 112 | global $pagenow; |
| 113 | 113 | |
| 114 | 114 | // New View page |
| 115 | - if( $pagenow === 'post-new.php' ) { |
|
| 116 | - $options['hideeditbox-gravityview'] = true; |
|
| 115 | + if ( $pagenow === 'post-new.php' ) { |
|
| 116 | + $options[ 'hideeditbox-gravityview' ] = true; |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | return $options; |
@@ -29,11 +29,11 @@ |
||
| 29 | 29 | $KWS_GF_Change_Lead_Creator = new KWS_GF_Change_Lead_Creator; |
| 30 | 30 | |
| 31 | 31 | // Now, no validation is required in the methods; let's hook in. |
| 32 | - remove_action('admin_init', array( $KWS_GF_Change_Lead_Creator, 'set_screen_mode' ) ); |
|
| 32 | + remove_action( 'admin_init', array( $KWS_GF_Change_Lead_Creator, 'set_screen_mode' ) ); |
|
| 33 | 33 | |
| 34 | - remove_action("gform_entry_info", array( $KWS_GF_Change_Lead_Creator, 'add_select' ), 10 ); |
|
| 34 | + remove_action( "gform_entry_info", array( $KWS_GF_Change_Lead_Creator, 'add_select' ), 10 ); |
|
| 35 | 35 | |
| 36 | - remove_action("gform_after_update_entry", array( $KWS_GF_Change_Lead_Creator, 'update_entry_creator' ), 10 ); |
|
| 36 | + remove_action( "gform_after_update_entry", array( $KWS_GF_Change_Lead_Creator, 'update_entry_creator' ), 10 ); |
|
| 37 | 37 | |
| 38 | 38 | } |
| 39 | 39 | } |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | if( is_array( $search_field['value'] ) ) { |
| 19 | - gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' ); |
|
| 19 | + gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' ); |
|
| 20 | 20 | $search_field['value'] = reset( $search_field['value'] ); |
| 21 | 21 | } |
| 22 | 22 | |
@@ -10,17 +10,17 @@ discard block |
||
| 10 | 10 | $search_field = $gravityview_view->search_field; |
| 11 | 11 | |
| 12 | 12 | // Make sure that there are choices to display |
| 13 | -if( empty( $search_field['choices'] ) ) { |
|
| 13 | +if ( empty( $search_field[ 'choices' ] ) ) { |
|
| 14 | 14 | gravityview()->log->debug( 'search-field-select.php - No choices for field' ); |
| 15 | 15 | return; |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | -if( is_array( $search_field['value'] ) ) { |
|
| 18 | +if ( is_array( $search_field[ 'value' ] ) ) { |
|
| 19 | 19 | gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' ); |
| 20 | - $search_field['value'] = reset( $search_field['value'] ); |
|
| 20 | + $search_field[ 'value' ] = reset( $search_field[ 'value' ] ); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | -$gf_field = GFAPI::get_field( $gravityview_view->getForm(), $search_field['key'] ); |
|
| 23 | +$gf_field = GFAPI::get_field( $gravityview_view->getForm(), $search_field[ 'key' ] ); |
|
| 24 | 24 | $placeholder = \GV\Utils::get( $gf_field, 'placeholder', '' ); |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -29,26 +29,26 @@ discard block |
||
| 29 | 29 | * @param string $default_option Default: `—` (—) |
| 30 | 30 | * @param string $field_type Field type: "select" or "multiselect" |
| 31 | 31 | */ |
| 32 | -$default_option = apply_filters('gravityview/extension/search/select_default', ( '' === $placeholder ? '—' : $placeholder ), 'select' ); |
|
| 32 | +$default_option = apply_filters( 'gravityview/extension/search/select_default', ( '' === $placeholder ? '—' : $placeholder ), 'select' ); |
|
| 33 | 33 | |
| 34 | 34 | ?> |
| 35 | 35 | <div class="gv-search-box gv-search-field-select"> |
| 36 | - <?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?> |
|
| 37 | - <label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label> |
|
| 36 | + <?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?> |
|
| 37 | + <label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label> |
|
| 38 | 38 | <?php } ?> |
| 39 | 39 | <p> |
| 40 | - <select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"> |
|
| 41 | - <option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option> |
|
| 40 | + <select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"> |
|
| 41 | + <option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option> |
|
| 42 | 42 | <?php |
| 43 | - foreach( $search_field['choices'] as $choice ) { ?> |
|
| 44 | - <?php if ( is_array( $choice['value'] ) ) { ?> |
|
| 45 | - <optgroup label="<?php echo esc_attr( $choice['text'] ); ?>"> |
|
| 46 | - <?php foreach ( $choice['value'] as $subchoice ): ?> |
|
| 47 | - <option value="<?php echo esc_attr( $subchoice['value'] ); ?>"><?php echo esc_html( $subchoice['text'] ); ?></option> |
|
| 43 | + foreach ( $search_field[ 'choices' ] as $choice ) { ?> |
|
| 44 | + <?php if ( is_array( $choice[ 'value' ] ) ) { ?> |
|
| 45 | + <optgroup label="<?php echo esc_attr( $choice[ 'text' ] ); ?>"> |
|
| 46 | + <?php foreach ( $choice[ 'value' ] as $subchoice ): ?> |
|
| 47 | + <option value="<?php echo esc_attr( $subchoice[ 'value' ] ); ?>"><?php echo esc_html( $subchoice[ 'text' ] ); ?></option> |
|
| 48 | 48 | <?php endforeach; ?> |
| 49 | 49 | </optgroup> |
| 50 | 50 | <?php } else { ?> |
| 51 | - <option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option> |
|
| 51 | + <option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option> |
|
| 52 | 52 | <?php } ?> |
| 53 | 53 | <?php } ?> |
| 54 | 54 | </select> |
@@ -58,16 +58,16 @@ |
||
| 58 | 58 | if ( $view->joins ) { |
| 59 | 59 | $form_ids = array(); |
| 60 | 60 | foreach ( $view->joins as $join ) { |
| 61 | - $form_ids[] = $join->join->ID; |
|
| 62 | - $form_ids[] = $join->join_on->ID; |
|
| 61 | + $form_ids[ ] = $join->join->ID; |
|
| 62 | + $form_ids[ ] = $join->join_on->ID; |
|
| 63 | 63 | } |
| 64 | 64 | foreach ( $entry->entries as $e ) { |
| 65 | - if ( ! in_array( $e['form_id'], $form_ids ) ) { |
|
| 65 | + if ( ! in_array( $e[ 'form_id' ], $form_ids ) ) { |
|
| 66 | 66 | gravityview()->log->error( 'The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', array( 'entry_id' => $e->ID, 'view_id' => $view->ID ) ); |
| 67 | 67 | return null; |
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | - } else if ( $view->form && $view->form->ID != $entry['form_id'] ) { |
|
| 70 | + } else if ( $view->form && $view->form->ID != $entry[ 'form_id' ] ) { |
|
| 71 | 71 | gravityview()->log->error( 'The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', array( 'entry_id' => $entry->ID, 'view_id' => $view->ID ) ); |
| 72 | 72 | return null; |
| 73 | 73 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | public function the_field( \GV\Field $field ) { |
| 28 | 28 | $renderer = new Field_Renderer(); |
| 29 | - $source = is_numeric( $field->ID ) ? ( GF_Form::by_id( $field->form_id ) ? : $this->view->form ) : new Internal_Source(); |
|
| 29 | + $source = is_numeric( $field->ID ) ? ( GF_Form::by_id( $field->form_id ) ?: $this->view->form ) : new Internal_Source(); |
|
| 30 | 30 | |
| 31 | 31 | return $renderer->render( $field, $this->view, $source, $this->entry->from_field( $field ), $this->request ); |
| 32 | 32 | } |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | foreach ( $fields->all() as $field ) { |
| 64 | 64 | $context = Template_Context::from_template( $this, compact( 'field' ) ); |
| 65 | 65 | |
| 66 | - $form = \GV\GF_Form::by_id( $field->form_id ) ? : $this->view->form; |
|
| 66 | + $form = \GV\GF_Form::by_id( $field->form_id ) ?: $this->view->form; |
|
| 67 | 67 | $entry = $this->entry->from_field( $field ); |
| 68 | 68 | |
| 69 | 69 | if ( ! $entry ) { |