| @@ -433,11 +433,10 @@ | ||
| 433 | 433 | |
| 434 | 434 | // If no override, remove as usual. |
| 435 | 435 | if ( null !== $override ) { |
| 436 | 436 | return $override; |
| 437 | - } // End if. | |
| 438 | - // Option page handling. | |
| 439 | - elseif ( 'options-page' === $a['type'] || empty( $a['id'] ) ) { | |
| 437 | + } elseif ( 'options-page' === $a['type'] || empty( $a['id'] ) ) { | |
| 438 | + // Option page handling. | |
| 440 | 439 | return cmb2_options( $a['id'] )->remove( $a['field_id'] ); |
| 441 | 440 | } |
| 442 | 441 | |
| 443 | 442 | // Remove metadata. |
| @@ -799,11 +798,10 @@ | ||
| 799 | 798 | |
| 800 | 799 | // Is timezone arg set? |
| 801 | 800 | if ( $this->args( 'timezone' ) ) { |
| 802 | 801 | $value = $this->args( 'timezone' ); |
| 803 | - } // End if. | |
| 804 | - // Is there another meta key with a timezone stored as its value we should use? | |
| 805 | - elseif ( $this->args( 'timezone_meta_key' ) ) { | |
| 802 | + } elseif ( $this->args( 'timezone_meta_key' ) ) { | |
| 803 | + // Is there another meta key with a timezone stored as its value we should use? | |
| 806 | 804 | $value = $this->get_data( $this->args( 'timezone_meta_key' ) ); |
| 807 | 805 | } |
| 808 | 806 | |
| 809 | 807 | return $value; |
