Changeset 11021

Timestamp:

06/08/2021 06:20:45 AM (5 years ago)

Author:

dd32

Message:

API: Slack Trac Bot: Properly access static members of the class through self:: rather than $this->.

Additionally, re-enable #12345-core for #core-editor, ensuring that only #12345 is disabled.

Follow up to [11020].

File:

• sites/trunk/common/includes/slack/trac/bot.php (modified) (1 diff)

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

@@ -53 +53 @@
         $tickets      = array();
 
-        // If the channel is not GitHub centric, match #1234 as a Trac ticket
-        if ( ! in_array( $this->get_channel(), $this->github_channels, true ) ) {
-            preg_match_all( "/(?:\s|^|\()#(?<id>$digits)(?:\-($ticket_tracs))?\b/", $text, $tickets, PREG_SET_ORDER );
-        }
+        // If the channel is not GitHub centric, require the trac to be suffixed like #1234-core
+        $require_trac = in_array( $this->get_channel(), self::$github_channels, true );
+        $require_trac = $require_trac ? '' : '?'; // regex optional.
+
+        preg_match_all( "/(?:\s|^|\()#(?<id>$digits)(?:\-($ticket_tracs)){$require_trac}\b/", $text, $tickets, PREG_SET_ORDER );
 
         // Always match trac-prefixed Tickets