Changeset 9531 for sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/webhook.php

Timestamp:

02/24/2020 06:28:21 AM (6 years ago)

Author:

dd32

Message:

Trac: Github PRs: Include the PR bodytext in the Trac notification.

This should help include some more context in the PRs and also make it easier to keep all pertitant information in one place (Trac).

See #5054.

File:

• sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/webhook.php (modified) (2 diffs)

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/webhook.php

@@ -58 +58 @@
         }
 
+        // Remove the specific Trac Ticket and PR Body from the DB version.
         $_pr_data_no_ticket = clone $pr_data;
-        unset( $_pr_data_no_ticket->trac_ticket );
+        unset( $_pr_data_no_ticket->trac_ticket, $_pr_data_no_ticket->body );
 
         // Step 3. If not in DB, or $pr_data->trac_ticket isn't yet in the DB, add a new row of it.
@@ -83 +84 @@
                 "''This ticket was mentioned in [{$pr_data->html_url} PR #{$pr_number}] " .
                     "on [https://github.com/{$pr_repo}/ {$pr_repo}] " .
-                    "by [{$pr_data->user->url} {$pr_data->user->name}].''"
+                    "by [{$pr_data->user->url} {$pr_data->user->name}].''" .
+                    ( trim( $pr_data->body ) ? "\n{$pr_data->body}" : '' )
             );
         }