Making WordPress.org

Changeset 3061


Ignore:
Timestamp:
05/02/2016 10:43:06 PM (9 years ago)
Author:
ocean90
Message:

Slack: Revert [3055] because it's already handled by the constructor.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sites/trunk/common/includes/slack/trac/trac.php

    r3055 r3061  
    252252
    253253        if ( isset( $ticket->component ) && isset( $this->ticket_component_filters[ $ticket->component ] ) ) {
    254             if ( is_string( $this->ticket_component_filters[ $ticket->component ] ) ) {
    255                 $channels = array_merge( $channels, array( $this->ticket_component_filters[ $ticket->component ] => true ) );
    256             } else {
    257                 $channels = array_merge( $channels, $this->ticket_component_filters[ $ticket->component ] );
    258             }
     254            $channels = array_merge( $channels, (array) $this->ticket_component_filters[ $ticket->component ] );
    259255        }
    260256
    261257        if ( isset( $ticket->focuses ) ) {
    262258            foreach ( explode( ', ', $ticket->focuses ) as $focus ) {
    263                 if ( ! isset( $this->ticket_component_filters[ $focus ] ) ) {
    264                     continue;
    265                 }
    266                 if ( is_string( $this->ticket_component_filters[ $focus ] ) ) {
    267                     $channels = array_merge( $channels, array( $this->ticket_component_filters[ $focus ] => true ) );
    268                 } else {
    269                     $channels = array_merge( $channels, $this->ticket_component_filters[ $focus ] );
     259                if ( isset( $this->ticket_component_filters[ $focus ] ) ) {
     260                    $channels = array_merge( $channels, (array) $this->ticket_component_filters[ $focus ] );
    270261                }
    271262            }
Note: See TracChangeset for help on using the changeset viewer.