Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update RC branch #1633

Merged
merged 30 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7b1dcd2
chore(deps): update dependency npm-run-all2 to ^7.0.1
renovate[bot] Oct 23, 2024
55d314c
chore(deps): update dependency @types/node to ^22.8.0
renovate[bot] Oct 25, 2024
6e49157
chore(deps): update dependency @playwright/test to ^1.48.2
renovate[bot] Oct 25, 2024
370c037
chore(deps): update dependency @types/node to ^22.8.1
renovate[bot] Oct 26, 2024
9c42680
chore(deps): update dependency @types/node to ^22.8.2
renovate[bot] Oct 28, 2024
718db58
Fix Yoast connector test
pereirinha Oct 29, 2024
0f19a19
Prevent error on cases where the trigger connector does mot have the …
pereirinha Oct 25, 2024
b919ca2
Include required default post fields, as the `inline_save` action is …
pereirinha Oct 25, 2024
12a8314
Add test for `save_alert_inline_edit`
pereirinha Oct 29, 2024
dfc6242
chore(deps): update wordpress monorepo
renovate[bot] Oct 30, 2024
9f210b2
Bump symfony/process from 5.4.40 to 5.4.46
dependabot[bot] Nov 6, 2024
9d2b197
chore(deps): update dependency uuid to v11
renovate[bot] Nov 10, 2024
b4212f4
chore(deps): update wordpress monorepo (#1629)
renovate[bot] Nov 16, 2024
b28b0cf
chore(deps): update dependency @wordpress/scripts to ^30.5.1 (#1630)
renovate[bot] Nov 18, 2024
c47b58d
chore(deps): update dependency @playwright/test to ^1.49.0 (#1631)
renovate[bot] Nov 18, 2024
6f886fe
Merge pull request #1625 from xwp/fix/yoast-connector-test
marcinkrzeminski Nov 20, 2024
c14d9e6
chore(deps): update node.js to ^20.18.1 (#1632)
renovate[bot] Nov 20, 2024
c1249cd
chore(deps): update node.js to v22
renovate[bot] Nov 20, 2024
cd040dd
Merge pull request #1620 from xwp/fix/inline-save-alerts
marcinkrzeminski Nov 21, 2024
e7dcb78
Merge pull request #1623 from xwp/renovate/uuid-11.x
marcinkrzeminski Nov 21, 2024
575cfeb
Merge pull request #1626 from xwp/renovate/node-22.x
marcinkrzeminski Nov 21, 2024
7ad457e
Merge pull request #1628 from xwp/dependabot/composer/symfony/process…
marcinkrzeminski Nov 21, 2024
28382d5
Update .nvmrc for the minimum Node version
marcinkrzeminski Nov 21, 2024
5d66b86
Fix PHPCS issues
marcinkrzeminski Nov 21, 2024
6e81e58
Fix PHPCS error
marcinkrzeminski Nov 21, 2024
628ccdd
Merge pull request #1634 from xwp/chore/fix-lint-issues
marcinkrzeminski Nov 21, 2024
8fca348
Update .nvmrc with Node 22.11.0
marcinkrzeminski Nov 21, 2024
20e0770
Merge pull request #1635 from xwp/chore/nvmrc
marcinkrzeminski Nov 21, 2024
e606511
Fix lint issues in tests
marcinkrzeminski Nov 21, 2024
05615af
Merge pull request #1636 from xwp/chore/fix-lint-issues
marcinkrzeminski Nov 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.18.0
22.11.0
4 changes: 2 additions & 2 deletions classes/class-alerts-list.php
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,8 @@ public function save_alert_inline_edit( $data, $postarr ) {
$trigger_author = wp_stream_filter_input( INPUT_POST, 'wp_stream_trigger_author' );
$trigger_connector_and_context = wp_stream_filter_input( INPUT_POST, 'wp_stream_trigger_connector_or_context' );
$trigger_connector_and_context_split = explode( '-', $trigger_connector_and_context );
$trigger_connector = $trigger_connector_and_context_split[0];
$trigger_context = $trigger_connector_and_context_split[1];
$trigger_connector = array_shift( $trigger_connector_and_context_split ) ?? '';
$trigger_context = array_shift( $trigger_connector_and_context_split ) ?? '';

$trigger_action = wp_stream_filter_input( INPUT_POST, 'wp_stream_trigger_action' );
$alert_type = wp_stream_filter_input( INPUT_POST, 'wp_stream_alert_type' );
Expand Down
18 changes: 18 additions & 0 deletions classes/class-alerts.php
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,24 @@ public function display_triggers_box( $post = array() ) {
echo '<label>' . esc_html__( 'Alert me when', 'stream' ) . '</label>';
$form->render_fields();
wp_nonce_field( 'save_alert', 'wp_stream_alerts_nonce' );

if ( $post instanceof \WP_Post ) :
/**
* These fields are required for the post to be saved, as the Admin AJAX inline_save action is fired.
*
* @see get_inline_data()
* @see wp_ajax_inline_save()
*/
?>
<input type="hidden" name="_status" value="<?php echo esc_attr( get_post_status( $post->ID ) ); ?>" />
<input type="hidden" name="jj" value="<?php echo esc_attr( mysql2date( 'd', $post->post_date, false ) ); ?>" />
<input type="hidden" name="mm" value="<?php echo esc_attr( mysql2date( 'm', $post->post_date, false ) ); ?>" />
<input type="hidden" name="aa" value="<?php echo esc_attr( mysql2date( 'Y', $post->post_date, false ) ); ?>" />
<input type="hidden" name="hh" value="<?php echo esc_attr( mysql2date( 'H', $post->post_date, false ) ); ?>" />
<input type="hidden" name="mn" value="<?php echo esc_attr( mysql2date( 'i', $post->post_date, false ) ); ?>" />
<input type="hidden" name="ss" value="<?php echo esc_attr( mysql2date( 's', $post->post_date, false ) ); ?>" />
<?php
endif;
}

/**
Expand Down
1 change: 1 addition & 0 deletions classes/class-connector.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ public function log( $message, $args, $object_id, $context, $action, $user_id =
/**
* Override the data logged. Returning false to this filter will stop the data from being logged.
* Examples of this filter in use can be found in some of the custom connectors.
*
* @see Connector_ACF::log_override()
*
* @return array|false An array of the data to be logged or false if it should not be logged.
Expand Down
28 changes: 14 additions & 14 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion connectors/class-connector-buddypress.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public function action_links( $links, $record ) {

// Check we have access to BuddyPress on this blog and that the user will have access to the links.
if ( ! $this->is_dependency_satisfied() || ! bp_current_user_can_moderate() ) {
return [];
return array();
}

// In the links, we also need to check the functions themselves as they're dependent on the BuddyPress module being enabled.
Expand Down
Loading
Loading