@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | * @return void |
| 60 | 60 | */ |
| 61 | 61 | public function set( $key, $value ) { |
| 62 | - $this->state[ $key ] = $value; |
|
| 62 | + $this->state[$key] = $value; |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /** |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | * @return mixed |
| 82 | 82 | */ |
| 83 | 83 | public function get( $key, $default ) { |
| 84 | - return $this->state[ $key ] ?? $default; |
|
| 84 | + return $this->state[$key] ?? $default; |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | /** |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | private function compressed_state() { |
| 193 | 193 | $compressed = array(); |
| 194 | 194 | foreach ( $this->state as $key => $value ) { |
| 195 | - $compressed[ self::compressed_key( $key ) ] = $value; |
|
| 195 | + $compressed[self::compressed_key( $key )] = $value; |
|
| 196 | 196 | } |
| 197 | 197 | return $compressed; |
| 198 | 198 | } |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | return; |
| 170 | 170 | } |
| 171 | 171 | |
| 172 | - $selected_xml = isset( $form['xml'] ) && isset( $form['xml'][ $selected_form ] ) ? $form['xml'][ $selected_form ] : ''; |
|
| 172 | + $selected_xml = isset( $form['xml'] ) && isset( $form['xml'][$selected_form] ) ? $form['xml'][$selected_form] : ''; |
|
| 173 | 173 | if ( empty( $selected_xml ) || strpos( $selected_xml, 'http' ) !== 0 ) { |
| 174 | 174 | return; |
| 175 | 175 | } |
@@ -186,8 +186,8 @@ discard block |
||
| 186 | 186 | * @return string |
| 187 | 187 | */ |
| 188 | 188 | private static function get_selected_in_form( $form, $value = 'form' ) { |
| 189 | - if ( ! empty( $form ) && ! empty( $form[ $value ] ) ) { |
|
| 190 | - return $form[ $value ]; |
|
| 189 | + if ( ! empty( $form ) && ! empty( $form[$value] ) ) { |
|
| 190 | + return $form[$value]; |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | return ''; |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | if ( $for === 'view' ) { |
| 218 | - $item_key = is_array( $view_keys ) ? $view_keys[ $form_key ] : $view_keys; |
|
| 218 | + $item_key = is_array( $view_keys ) ? $view_keys[$form_key] : $view_keys; |
|
| 219 | 219 | $shortcode = '[display-frm-data id=%1$s filter=limited]'; |
| 220 | 220 | } elseif ( $for === 'form' ) { |
| 221 | 221 | $item_key = $form_key; |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | continue; |
| 231 | 231 | } |
| 232 | 232 | |
| 233 | - $page_ids[ $for ] = wp_insert_post( |
|
| 233 | + $page_ids[$for] = wp_insert_post( |
|
| 234 | 234 | array( |
| 235 | 235 | 'post_title' => $name, |
| 236 | 236 | 'post_type' => 'page', |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.NonceVerification.Missing |
| 384 | 384 | $file_type = sanitize_option( 'upload_path', $_FILES['frm_import_file']['name'] ); |
| 385 | 385 | $file_type = strtolower( pathinfo( $file_type, PATHINFO_EXTENSION ) ); |
| 386 | - if ( 'xml' !== $file_type && isset( $export_format[ $file_type ] ) ) { |
|
| 386 | + if ( 'xml' !== $file_type && isset( $export_format[$file_type] ) ) { |
|
| 387 | 387 | // allow other file types to be imported |
| 388 | 388 | do_action( 'frm_before_import_' . $file_type ); |
| 389 | 389 | |
@@ -477,7 +477,7 @@ discard block |
||
| 477 | 477 | foreach ( $type as $tb_type ) { |
| 478 | 478 | $where = array(); |
| 479 | 479 | $join = ''; |
| 480 | - $table = $tables[ $tb_type ]; |
|
| 480 | + $table = $tables[$tb_type]; |
|
| 481 | 481 | |
| 482 | 482 | $select = $table . '.id'; |
| 483 | 483 | $query_vars = array(); |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | $table . '.parent_form_id' => $args['ids'], |
| 493 | 493 | ); |
| 494 | 494 | } else { |
| 495 | - $where[ $table . '.status !' ] = 'draft'; |
|
| 495 | + $where[$table . '.status !'] = 'draft'; |
|
| 496 | 496 | } |
| 497 | 497 | break; |
| 498 | 498 | case 'actions': |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | case 'items': |
| 506 | 506 | // $join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)"; |
| 507 | 507 | if ( $args['ids'] ) { |
| 508 | - $where[ $table . '.form_id' ] = $args['ids']; |
|
| 508 | + $where[$table . '.form_id'] = $args['ids']; |
|
| 509 | 509 | } |
| 510 | 510 | break; |
| 511 | 511 | case 'styles': |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | } |
| 547 | 547 | }//end switch |
| 548 | 548 | |
| 549 | - $records[ $tb_type ] = FrmDb::get_col( $table . $join, $where, $select ); |
|
| 549 | + $records[$tb_type] = FrmDb::get_col( $table . $join, $where, $select ); |
|
| 550 | 550 | unset( $tb_type ); |
| 551 | 551 | }//end foreach |
| 552 | 552 | |
@@ -745,7 +745,7 @@ discard block |
||
| 745 | 745 | $no_export_fields = FrmField::no_save_fields(); |
| 746 | 746 | foreach ( $csv_fields as $k => $f ) { |
| 747 | 747 | if ( in_array( $f->type, $no_export_fields, true ) ) { |
| 748 | - unset( $csv_fields[ $k ] ); |
|
| 748 | + unset( $csv_fields[$k] ); |
|
| 749 | 749 | } |
| 750 | 750 | } |
| 751 | 751 | |
@@ -712,7 +712,8 @@ |
||
| 712 | 712 | */ |
| 713 | 713 | public static function process_entry( $errors = '', $ajax = false ) { |
| 714 | 714 | $form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' ); |
| 715 | - if ( FrmAppHelper::is_admin() || empty( $_POST ) || empty( $form_id ) || ! isset( $_POST['item_key'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing |
|
| 715 | + if ( FrmAppHelper::is_admin() || empty( $_POST ) || empty( $form_id ) || ! isset( $_POST['item_key'] ) ) { |
|
| 716 | +// phpcs:ignore WordPress.Security.NonceVerification.Missing |
|
| 716 | 717 | return; |
| 717 | 718 | } |
| 718 | 719 | |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | |
| 155 | 155 | unset( $filename ); |
| 156 | 156 | |
| 157 | - $comment_count = FrmDb::get_count( |
|
| 157 | + $comment_count = FrmDb::get_count( |
|
| 158 | 158 | 'frm_item_metas', |
| 159 | 159 | array( |
| 160 | 160 | 'item_id' => $atts['entry_ids'], |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | private static function prepare_csv_headings() { |
| 317 | 317 | $headings = array(); |
| 318 | 318 | self::csv_headings( $headings ); |
| 319 | - $headings = apply_filters( |
|
| 319 | + $headings = apply_filters( |
|
| 320 | 320 | 'frm_csv_columns', |
| 321 | 321 | $headings, |
| 322 | 322 | self::$form_id, |
@@ -345,15 +345,15 @@ discard block |
||
| 345 | 345 | $field_headings = array(); |
| 346 | 346 | $separate_values = array( 'user_id', 'file', 'data', 'date' ); |
| 347 | 347 | if ( ! empty( $col->field_options['separate_value'] ) && ! in_array( $col->type, $separate_values, true ) ) { |
| 348 | - $field_headings[ $col->id . '_label' ] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) ); |
|
| 348 | + $field_headings[$col->id . '_label'] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) ); |
|
| 349 | 349 | } |
| 350 | 350 | |
| 351 | - if ( ! empty( $field_headings[ $col->id . '_label' ] ) ) { |
|
| 352 | - $field_headings[ $col->id ] = strip_tags( $col->name . ' ' . __( '(value)', 'formidable' ) ); |
|
| 351 | + if ( ! empty( $field_headings[$col->id . '_label'] ) ) { |
|
| 352 | + $field_headings[$col->id] = strip_tags( $col->name . ' ' . __( '(value)', 'formidable' ) ); |
|
| 353 | 353 | } else { |
| 354 | - $field_headings[ $col->id ] = strip_tags( $col->name ); |
|
| 354 | + $field_headings[$col->id] = strip_tags( $col->name ); |
|
| 355 | 355 | } |
| 356 | - $field_headings = apply_filters( |
|
| 356 | + $field_headings = apply_filters( |
|
| 357 | 357 | 'frm_csv_field_columns', |
| 358 | 358 | $field_headings, |
| 359 | 359 | array_merge( |
@@ -378,14 +378,14 @@ discard block |
||
| 378 | 378 | if ( self::is_the_child_of_a_repeater( $col ) ) { |
| 379 | 379 | $repeater_id = $col->field_options['in_section']; |
| 380 | 380 | // Set a placeholder to maintain order for repeater fields. |
| 381 | - $headings[ 'repeater' . $repeater_id ] = array(); |
|
| 381 | + $headings['repeater' . $repeater_id] = array(); |
|
| 382 | 382 | |
| 383 | - if ( ! isset( $fields_by_repeater_id[ $repeater_id ] ) ) { |
|
| 384 | - $fields_by_repeater_id[ $repeater_id ] = array(); |
|
| 383 | + if ( ! isset( $fields_by_repeater_id[$repeater_id] ) ) { |
|
| 384 | + $fields_by_repeater_id[$repeater_id] = array(); |
|
| 385 | 385 | $repeater_ids[] = $repeater_id; |
| 386 | 386 | } |
| 387 | 387 | |
| 388 | - $fields_by_repeater_id[ $repeater_id ][] = $col; |
|
| 388 | + $fields_by_repeater_id[$repeater_id][] = $col; |
|
| 389 | 389 | |
| 390 | 390 | continue; |
| 391 | 391 | } |
@@ -404,8 +404,8 @@ discard block |
||
| 404 | 404 | $end = strpos( $row->meta_value, ':{' ); |
| 405 | 405 | $length = substr( $row->meta_value, $start, $end - $start ); |
| 406 | 406 | |
| 407 | - if ( $length > $max[ $row->field_id ] ) { |
|
| 408 | - $max[ $row->field_id ] = $length; |
|
| 407 | + if ( $length > $max[$row->field_id] ) { |
|
| 408 | + $max[$row->field_id] = $length; |
|
| 409 | 409 | } |
| 410 | 410 | } |
| 411 | 411 | unset( $start, $end, $length, $row, $repeater_meta, $where ); |
@@ -416,17 +416,17 @@ discard block |
||
| 416 | 416 | $repeater_id = str_replace( 'repeater', '', $key ); |
| 417 | 417 | |
| 418 | 418 | $repeater_headings = array(); |
| 419 | - foreach ( $fields_by_repeater_id[ $repeater_id ] as $col ) { |
|
| 419 | + foreach ( $fields_by_repeater_id[$repeater_id] as $col ) { |
|
| 420 | 420 | $repeater_headings += self::field_headings( $col ); |
| 421 | 421 | } |
| 422 | 422 | |
| 423 | - for ( $i = 0; $i < $max[ $repeater_id ]; $i++ ) { |
|
| 423 | + for ( $i = 0; $i < $max[$repeater_id]; $i ++ ) { |
|
| 424 | 424 | foreach ( $repeater_headings as $repeater_key => $repeater_name ) { |
| 425 | - $flat[ $repeater_key . '[' . $i . ']' ] = $repeater_name; |
|
| 425 | + $flat[$repeater_key . '[' . $i . ']'] = $repeater_name; |
|
| 426 | 426 | } |
| 427 | 427 | } |
| 428 | 428 | } else { |
| 429 | - $flat[ $key ] = $heading; |
|
| 429 | + $flat[$key] = $heading; |
|
| 430 | 430 | } |
| 431 | 431 | } |
| 432 | 432 | |
@@ -439,10 +439,10 @@ discard block |
||
| 439 | 439 | }//end if |
| 440 | 440 | |
| 441 | 441 | if ( self::$comment_count ) { |
| 442 | - for ( $i = 0; $i < self::$comment_count; $i++ ) { |
|
| 443 | - $headings[ 'comment' . $i ] = __( 'Comment', 'formidable' ); |
|
| 444 | - $headings[ 'comment_user_id' . $i ] = __( 'Comment User', 'formidable' ); |
|
| 445 | - $headings[ 'comment_created_at' . $i ] = __( 'Comment Date', 'formidable' ); |
|
| 442 | + for ( $i = 0; $i < self::$comment_count; $i ++ ) { |
|
| 443 | + $headings['comment' . $i] = __( 'Comment', 'formidable' ); |
|
| 444 | + $headings['comment_user_id' . $i] = __( 'Comment User', 'formidable' ); |
|
| 445 | + $headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' ); |
|
| 446 | 446 | } |
| 447 | 447 | unset( $i ); |
| 448 | 448 | } |
@@ -495,7 +495,7 @@ discard block |
||
| 495 | 495 | */ |
| 496 | 496 | private static function prepare_next_csv_rows( $next_set ) { |
| 497 | 497 | if ( FrmAppHelper::pro_is_installed() ) { |
| 498 | - $where = array( |
|
| 498 | + $where = array( |
|
| 499 | 499 | 'or' => 1, |
| 500 | 500 | 'id' => $next_set, |
| 501 | 501 | 'parent_item_id' => $next_set, |
@@ -560,32 +560,32 @@ discard block |
||
| 560 | 560 | continue; |
| 561 | 561 | } |
| 562 | 562 | |
| 563 | - if ( ! isset( $entries[ self::$entry->parent_item_id ] ) ) { |
|
| 564 | - $entries[ self::$entry->parent_item_id ] = new stdClass(); |
|
| 565 | - $entries[ self::$entry->parent_item_id ]->metas = array(); |
|
| 563 | + if ( ! isset( $entries[self::$entry->parent_item_id] ) ) { |
|
| 564 | + $entries[self::$entry->parent_item_id] = new stdClass(); |
|
| 565 | + $entries[self::$entry->parent_item_id]->metas = array(); |
|
| 566 | 566 | } |
| 567 | 567 | |
| 568 | - if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) { |
|
| 569 | - $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = array(); |
|
| 570 | - } elseif ( ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) { |
|
| 568 | + if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) { |
|
| 569 | + $entries[self::$entry->parent_item_id]->metas[$meta_id] = array(); |
|
| 570 | + } elseif ( ! is_array( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) { |
|
| 571 | 571 | // if the data is here, it should be an array but if this field has collected data |
| 572 | 572 | // both while inside and outside of the repeating section, it's possible this is a string. |
| 573 | - $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = (array) $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ]; |
|
| 573 | + $entries[self::$entry->parent_item_id]->metas[$meta_id] = (array) $entries[self::$entry->parent_item_id]->metas[$meta_id]; |
|
| 574 | 574 | } |
| 575 | 575 | |
| 576 | 576 | // Add the repeated values. |
| 577 | - $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ][] = $meta_value; |
|
| 577 | + $entries[self::$entry->parent_item_id]->metas[$meta_id][] = $meta_value; |
|
| 578 | 578 | }//end foreach |
| 579 | 579 | |
| 580 | 580 | self::$entry->metas = self::fill_missing_repeater_metas( self::$entry->metas, $entries ); |
| 581 | - $entries[ self::$entry->parent_item_id ]->metas += self::$entry->metas; |
|
| 581 | + $entries[self::$entry->parent_item_id]->metas += self::$entry->metas; |
|
| 582 | 582 | }//end if |
| 583 | 583 | |
| 584 | 584 | // add the embedded form id |
| 585 | - if ( ! isset( $entries[ self::$entry->parent_item_id ]->embedded_fields ) ) { |
|
| 586 | - $entries[ self::$entry->parent_item_id ]->embedded_fields = array(); |
|
| 585 | + if ( ! isset( $entries[self::$entry->parent_item_id]->embedded_fields ) ) { |
|
| 586 | + $entries[self::$entry->parent_item_id]->embedded_fields = array(); |
|
| 587 | 587 | } |
| 588 | - $entries[ self::$entry->parent_item_id ]->embedded_fields[ self::$entry->id ] = self::$entry->form_id; |
|
| 588 | + $entries[self::$entry->parent_item_id]->embedded_fields[self::$entry->id] = self::$entry->form_id; |
|
| 589 | 589 | } |
| 590 | 590 | |
| 591 | 591 | /** |
@@ -606,19 +606,19 @@ discard block |
||
| 606 | 606 | } |
| 607 | 607 | |
| 608 | 608 | $repeater_id = $field->field_options['in_section']; |
| 609 | - if ( ! isset( self::$fields_by_repeater_id[ $repeater_id ] ) ) { |
|
| 609 | + if ( ! isset( self::$fields_by_repeater_id[$repeater_id] ) ) { |
|
| 610 | 610 | return $metas; |
| 611 | 611 | } |
| 612 | 612 | |
| 613 | - foreach ( self::$fields_by_repeater_id[ $repeater_id ] as $repeater_child ) { |
|
| 614 | - if ( ! isset( $metas[ $repeater_child->id ] ) ) { |
|
| 615 | - $metas[ $repeater_child->id ] = ''; |
|
| 613 | + foreach ( self::$fields_by_repeater_id[$repeater_id] as $repeater_child ) { |
|
| 614 | + if ( ! isset( $metas[$repeater_child->id] ) ) { |
|
| 615 | + $metas[$repeater_child->id] = ''; |
|
| 616 | 616 | |
| 617 | - if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) || ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) ) { |
|
| 618 | - $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] = array(); |
|
| 617 | + if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$repeater_child->id] ) || ! is_array( $entries[self::$entry->parent_item_id]->metas[$repeater_child->id] ) ) { |
|
| 618 | + $entries[self::$entry->parent_item_id]->metas[$repeater_child->id] = array(); |
|
| 619 | 619 | } |
| 620 | 620 | |
| 621 | - $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ][] = ''; |
|
| 621 | + $entries[self::$entry->parent_item_id]->metas[$repeater_child->id][] = ''; |
|
| 622 | 622 | } |
| 623 | 623 | } |
| 624 | 624 | |
@@ -647,7 +647,7 @@ discard block |
||
| 647 | 647 | */ |
| 648 | 648 | private static function add_field_values_to_csv( &$row ) { |
| 649 | 649 | foreach ( self::$fields as $col ) { |
| 650 | - $field_value = self::$entry->metas[ $col->id ] ?? false; |
|
| 650 | + $field_value = self::$entry->metas[$col->id] ?? false; |
|
| 651 | 651 | |
| 652 | 652 | FrmFieldsHelper::prepare_field_value( $field_value, $col->type ); |
| 653 | 653 | self::add_array_values_to_columns( $row, compact( 'col', 'field_value' ) ); |
@@ -666,20 +666,20 @@ discard block |
||
| 666 | 666 | if ( ! empty( $col->field_options['separate_value'] ) ) { |
| 667 | 667 | $label_key = $col->id . '_label'; |
| 668 | 668 | if ( self::is_the_child_of_a_repeater( $col ) ) { |
| 669 | - $row[ $label_key ] = array(); |
|
| 669 | + $row[$label_key] = array(); |
|
| 670 | 670 | |
| 671 | 671 | if ( is_array( $field_value ) ) { |
| 672 | 672 | foreach ( $field_value as $value ) { |
| 673 | - $row[ $label_key ][] = self::get_separate_value_label( $value, $col ); |
|
| 673 | + $row[$label_key][] = self::get_separate_value_label( $value, $col ); |
|
| 674 | 674 | } |
| 675 | 675 | } |
| 676 | 676 | } else { |
| 677 | - $row[ $label_key ] = self::get_separate_value_label( $field_value, $col ); |
|
| 677 | + $row[$label_key] = self::get_separate_value_label( $field_value, $col ); |
|
| 678 | 678 | } |
| 679 | 679 | unset( $label_key ); |
| 680 | 680 | } |
| 681 | 681 | |
| 682 | - $row[ $col->id ] = $field_value; |
|
| 682 | + $row[$col->id] = $field_value; |
|
| 683 | 683 | |
| 684 | 684 | unset( $col, $field_value ); |
| 685 | 685 | }//end foreach |
@@ -702,7 +702,7 @@ discard block |
||
| 702 | 702 | 'show_icon' => false, |
| 703 | 703 | 'entry_id' => self::$entry->id, |
| 704 | 704 | 'sep' => self::$separator, |
| 705 | - 'embedded_field_id' => isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[ self::$entry->id ] ) ? 'form' . self::$entry->embedded_fields[ self::$entry->id ] : 0, |
|
| 705 | + 'embedded_field_id' => isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[self::$entry->id] ) ? 'form' . self::$entry->embedded_fields[self::$entry->id] : 0, |
|
| 706 | 706 | ) |
| 707 | 707 | ); |
| 708 | 708 | } |
@@ -721,8 +721,8 @@ discard block |
||
| 721 | 721 | // This is combo field inside repeater. The heading key has this format: [86_first[0]]. |
| 722 | 722 | foreach ( $sub_value as $sub_key => $sub_sub_value ) { |
| 723 | 723 | $column_key = $atts['col']->id . '_' . $sub_key . '[' . $key . ']'; |
| 724 | - if ( ! is_numeric( $sub_key ) && isset( self::$headings[ $column_key ] ) ) { |
|
| 725 | - $row[ $column_key ] = $sub_sub_value; |
|
| 724 | + if ( ! is_numeric( $sub_key ) && isset( self::$headings[$column_key] ) ) { |
|
| 725 | + $row[$column_key] = $sub_sub_value; |
|
| 726 | 726 | } |
| 727 | 727 | } |
| 728 | 728 | |
@@ -730,8 +730,8 @@ discard block |
||
| 730 | 730 | } |
| 731 | 731 | |
| 732 | 732 | $column_key = $atts['col']->id . '_' . $key; |
| 733 | - if ( ! is_numeric( $key ) && isset( self::$headings[ $column_key ] ) ) { |
|
| 734 | - $row[ $column_key ] = $sub_value; |
|
| 733 | + if ( ! is_numeric( $key ) && isset( self::$headings[$column_key] ) ) { |
|
| 734 | + $row[$column_key] = $sub_value; |
|
| 735 | 735 | } |
| 736 | 736 | } |
| 737 | 737 | } |
@@ -766,18 +766,18 @@ discard block |
||
| 766 | 766 | $echo = 'echo' === self::$mode; |
| 767 | 767 | |
| 768 | 768 | foreach ( self::$headings as $k => $heading ) { |
| 769 | - if ( isset( $rows[ $k ] ) ) { |
|
| 770 | - $row = $rows[ $k ]; |
|
| 769 | + if ( isset( $rows[$k] ) ) { |
|
| 770 | + $row = $rows[$k]; |
|
| 771 | 771 | } else { |
| 772 | 772 | $row = ''; |
| 773 | 773 | // array indexed data is not at $rows[ $k ] |
| 774 | - if ( $k[ strlen( $k ) - 1 ] === ']' ) { |
|
| 774 | + if ( $k[strlen( $k ) - 1] === ']' ) { |
|
| 775 | 775 | $start = strrpos( $k, '[' ); |
| 776 | - $key = substr( $k, 0, $start++ ); |
|
| 776 | + $key = substr( $k, 0, $start ++ ); |
|
| 777 | 777 | $index = substr( $k, $start, strlen( $k ) - 1 - $start ); |
| 778 | 778 | |
| 779 | - if ( isset( $rows[ $key ] ) && isset( $rows[ $key ][ $index ] ) ) { |
|
| 780 | - $row = $rows[ $key ][ $index ]; |
|
| 779 | + if ( isset( $rows[$key] ) && isset( $rows[$key][$index] ) ) { |
|
| 780 | + $row = $rows[$key][$index]; |
|
| 781 | 781 | } |
| 782 | 782 | |
| 783 | 783 | unset( $start, $key, $index ); |