Changeset 3089

Timestamp:

05/05/2016 03:35:52 PM (9 years ago)

Author:

ocean90

Message:

Slack: Revert [3088] and instead limit characters which are allowed before a ticket number.

File:

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

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

@@ -43 +43 @@
         $digits = Trac::get_digit_capture();
         $ticket_tracs = '?<trac>' . Trac::get_regex();
-        preg_match_all( "/[^&`]#(?<id>$digits)(?:\-($ticket_tracs)\b)?/", $text, $tickets, PREG_SET_ORDER );
-        preg_match_all( "/[^&`]#($ticket_tracs)(?<id>$digits)\b/", $text, $tickets_alt, PREG_SET_ORDER );
+        preg_match_all( "/(?:\s|^|\()#(?<id>$digits)(?:\-($ticket_tracs)\b)?/", $text, $tickets, PREG_SET_ORDER );
+        preg_match_all( "/(?:\s|^|\()#($ticket_tracs)(?<id>$digits)\b/", $text, $tickets_alt, PREG_SET_ORDER );
         preg_match_all( "~https?://($ticket_tracs).trac.wordpress.org/ticket/(?<id>$digits)~", $text, $tickets_url, PREG_SET_ORDER );
         foreach ( $tickets_url as &$ticket ) {