Changeset 3055

Timestamp:

05/01/2016 10:27:41 PM (9 years ago)

Author:

ocean90

Message:

Slack: In Trac::get_ticket_channels() support $ticket_component_filters with strings.

File:

• sites/trunk/common/includes/slack/trac/trac.php (modified) (5 diffs)

sites/trunk/common/includes/slack/trac/trac.php

@@ -94 +94 @@
         $ns = __NAMESPACE__ . '\\Tracs\\';
 
-        $class = $ns . $trac;   
+        $class = $ns . $trac;
         if ( class_exists( $class ) ) {
             return new $class;
@@ -103 +103 @@
             return new $class;
         }
-        
+
         if ( preg_match( '~([a-z]+).trac.wordpress.org~', $trac, $match ) ) {
             $class = $ns . $match[1];
@@ -252 +252 @@
 
         if ( isset( $ticket->component ) && isset( $this->ticket_component_filters[ $ticket->component ] ) ) {
-            $channels = array_merge( $channels, (array) $this->ticket_component_filters[ $ticket->component ] );
+            if ( is_string( $this->ticket_component_filters[ $ticket->component ] ) ) {
+                $channels = array_merge( $channels, array( $this->ticket_component_filters[ $ticket->component ] => true ) );
+            } else {
+                $channels = array_merge( $channels, $this->ticket_component_filters[ $ticket->component ] );
+            }
         }
 
         if ( isset( $ticket->focuses ) ) {
             foreach ( explode( ', ', $ticket->focuses ) as $focus ) {
-                if ( isset( $this->ticket_component_filters[ $focus ] ) ) {
-                    $channels = array_merge( $channels, (array) $this->ticket_component_filters[ $focus ] );
+                if ( ! isset( $this->ticket_component_filters[ $focus ] ) ) {
+                    continue;
+                }
+                if ( is_string( $this->ticket_component_filters[ $focus ] ) ) {
+                    $channels = array_merge( $channels, array( $this->ticket_component_filters[ $focus ] => true ) );
+                } else {
+                    $channels = array_merge( $channels, $this->ticket_component_filters[ $focus ] );
                 }
             }
@@ -277 +286 @@
         if ( $channel === $this->primary_channel ) {
             return $this->primary_channel_ticket_format;
-        }       
+        }
         return 'description';
     }
@@ -284 +293 @@
         $text = str_replace( "\r\n", "\n", $text );
         $text = trim( str_replace(
-            array( "\n{{{\n", "\n}}}\n", '{{{', '}}}' ),    
+            array( "\n{{{\n", "\n}}}\n", '{{{', '}}}' ),
             array( "\n```\n", "\n```\n", '`',   '`' ),
             "\n$text\n"