Fix false positives labels and warning about undefined variable

This commit is contained in:
savvasha
2018-05-15 17:47:32 +03:00
parent 99a927dcd7
commit 4f33f8543e

View File

@@ -677,6 +677,7 @@ class SP_Player_List extends SP_Secondary_Post {
endif; endif;
$labels = array(); $labels = array();
$labels_title = array();
foreach( $this->columns as $key ): foreach( $this->columns as $key ):
if ( $key == 'number' ): if ( $key == 'number' ):
$labels[ $key ] = '#'; $labels[ $key ] = '#';
@@ -725,20 +726,18 @@ class SP_Player_List extends SP_Secondary_Post {
foreach ( $columns as $key => $label ): foreach ( $columns as $key => $label ):
if ( ! in_array( $key, $this->columns ) ): if ( ! in_array( $key, $this->columns ) ):
unset( $columns[ $key ] ); unset( $columns[ $key ] );
unset( $columns_title[ $key ] );
endif; endif;
endforeach; endforeach;
$labels = array(); $labels = array();
if ( in_array( 'number', $this->columns ) ) $labels['number'] = '#'; if ( in_array( 'number', $this->columns ) ) $labels['number'] = '#';
$labels['name'] = __( 'Player', 'sportspress' ); $labels['name'] = __( 'Player', 'sportspress' );
$labels_title['name'] = __( 'Player', 'sportspress' );
if ( in_array( 'team', $this->columns ) ) { if ( in_array( 'team', $this->columns ) ) {
$labels['team'] = __( 'Team', 'sportspress' ); $labels['team'] = __( 'Team', 'sportspress' );
$labels_title['team'] = __( 'Team', 'sportspress' );
} }
if ( in_array( 'position', $this->columns ) ) { if ( in_array( 'position', $this->columns ) ) {
$labels['position'] = __( 'Position', 'sportspress' ); $labels['position'] = __( 'Position', 'sportspress' );
$labels_title['position'] = __( 'Position', 'sportspress' );
} }
$merged['head'] = array_merge( $labels, $columns ); $merged['head'] = array_merge( $labels, $columns );