Skip to content

Commit 9764070

Browse files
committed
Squashed commit of the following:
commit a615c5c Author: Dion Hulse <[email protected]> Date: Thu Jul 31 00:57:28 2025 +0000 Plugin Directory: Release Confirmation: Switch the form to a POST, to allow additional parameters. See #8009. git-svn-id: https://meta.svn.wordpress.org/sites/trunk@14499 74240141-8908-4e6f-9713-ba540dce6ec7 commit f10e4ad Author: Dion Hulse <[email protected]> Date: Wed Jul 30 03:59:06 2025 +0000 Trac: PRs: Support the `css` code block style. Additionally, aparently GitHub allows spaces between the code block starter and the format, so support that too. git-svn-id: https://meta.svn.wordpress.org/sites/trunk@14498 74240141-8908-4e6f-9713-ba540dce6ec7 commit ee154ad Author: Dion Hulse <[email protected]> Date: Tue Jul 29 00:28:36 2025 +0000 Plugin Directory: Release Confirmation: Partially revert [14495], this depends upon some wporg-two-factor changes that hadn't yet been made. Fixes confirming/discarding releases. git-svn-id: https://meta.svn.wordpress.org/sites/trunk@14497 74240141-8908-4e6f-9713-ba540dce6ec7
1 parent 57a45e1 commit 9764070

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

api.wordpress.org/public_html/dotorg/trac/pr/functions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ function format_github_content_for_trac_comment( $desc ) {
386386

387387
// Convert Code blocks.
388388
$desc = preg_replace_callback(
389-
'#^(?P<indent>[ >]*)```(?P<format>[a-z]+$)(?P<code>.+?)```$#sm',
389+
'#^(?P<indent>[ >]*)```[ ]*(?P<format>[a-z]+$)(?P<code>.+?)```$#sm',
390390
function( $m ) {
391391
$format = trim( $m['format'] );
392392

@@ -400,7 +400,7 @@ function( $m ) {
400400
*
401401
* See https://trac.edgewall.org/wiki/1.1/WikiProcessors#AvailableProcessors
402402
*/
403-
$supported_formats = [ 'xml', 'php', 'js', 'javascript', 'sql', 'sh', 'diff' ];
403+
$supported_formats = [ 'xml', 'php', 'js', 'javascript', 'css', 'sql', 'sh', 'diff' ];
404404
if ( ! in_array( $format, $supported_formats ) ) {
405405
$format = 'default';
406406
}

wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-release-confirmation.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ static function get_actions( $plugin, $data ) {
298298
$discard_link = get_revalidation_js_url( $discard_link );
299299

300300
$buttons[] = sprintf(
301-
'<button formaction="%s" class="wp-element-button button approve-release" data-2fa-required data-2fa-message="%s">%s</a>',
301+
'<button formaction="%s" class="wp-element-button button approve-release" data-2fa-required data-2fa-message="%s">%s</button>',
302302
$confirm_link,
303303
esc_attr(
304304
sprintf(
@@ -312,7 +312,7 @@ static function get_actions( $plugin, $data ) {
312312
);
313313

314314
$buttons[] = sprintf(
315-
'<button formaction="%s" class="wp-element-button button approve-release" data-2fa-required data-2fa-message="%s">%s</a>',
315+
'<button formaction="%s" class="wp-element-button button approve-release" data-2fa-required data-2fa-message="%s">%s</button>',
316316
$discard_link,
317317
esc_attr(
318318
sprintf(
@@ -333,7 +333,7 @@ static function get_actions( $plugin, $data ) {
333333
) {
334334
// Plugin reviewers can undo a discard within 48hrs.
335335
$buttons[] = sprintf(
336-
'<a href="%s" class="wp-element-button button undo-discard">%s</a>',
336+
'<button formaction="%s" class="wp-element-button button undo-discard">%s</buttona>',
337337
Template::get_release_confirmation_link( $data['tag'], $plugin, 'undo-discard' ),
338338
__( 'Undo Discard', 'wporg-plugins' )
339339
);

0 commit comments

Comments
 (0)