Skip to content

Commit

Permalink
Merge branch 'trunk' into fix/58919-cache-mo-file-paths
Browse files Browse the repository at this point in the history
  • Loading branch information
@swissspidy
swissspidy committed Nov 17, 2023
2 parents 8e86fe1 + b892a41 commit 2f0a5cb
Show file tree
Hide file tree
Showing 12 changed files with 1,813 additions and 1,658 deletions.
3,060 changes: 1,531 additions & 1,529 deletions package-lock.json
View file

Large diffs are not rendered by default.

138 changes: 69 additions & 69 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
"@lodder/grunt-postcss": "^3.1.1",
"@playwright/test": "1.32.0",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
"@wordpress/babel-preset-default": "7.26.12",
"@wordpress/dependency-extraction-webpack-plugin": "4.25.12",
"@wordpress/e2e-test-utils": "10.13.12",
"@wordpress/e2e-test-utils-playwright": "0.10.12",
"@wordpress/scripts": "26.13.12",
"@wordpress/babel-preset-default": "7.26.13",
"@wordpress/dependency-extraction-webpack-plugin": "4.25.13",
"@wordpress/e2e-test-utils": "10.13.13",
"@wordpress/e2e-test-utils-playwright": "0.10.13",
"@wordpress/scripts": "26.13.13",
"autoprefixer": "10.4.16",
"chalk": "5.3.0",
"check-node-version": "4.2.1",
Expand Down Expand Up @@ -79,70 +79,70 @@
"dependencies": {
"@emotion/is-prop-valid": "0.8.8",
"@emotion/memoize": "0.7.4",
"@wordpress/a11y": "3.42.12",
"@wordpress/annotations": "2.42.12",
"@wordpress/api-fetch": "6.39.12",
"@wordpress/autop": "3.42.12",
"@wordpress/blob": "3.42.12",
"@wordpress/block-directory": "4.19.12",
"@wordpress/block-editor": "12.10.12",
"@wordpress/block-library": "8.19.12",
"@wordpress/block-serialization-default-parser": "4.42.12",
"@wordpress/blocks": "12.19.12",
"@wordpress/commands": "0.13.12",
"@wordpress/components": "25.8.12",
"@wordpress/compose": "6.19.12",
"@wordpress/core-commands": "0.11.12",
"@wordpress/core-data": "6.19.12",
"@wordpress/customize-widgets": "4.19.12",
"@wordpress/data": "9.12.12",
"@wordpress/data-controls": "3.11.12",
"@wordpress/date": "4.42.12",
"@wordpress/deprecated": "3.42.12",
"@wordpress/dom": "3.42.12",
"@wordpress/dom-ready": "3.42.12",
"@wordpress/edit-post": "7.19.12",
"@wordpress/edit-site": "5.19.12",
"@wordpress/edit-widgets": "5.19.12",
"@wordpress/editor": "13.19.12",
"@wordpress/element": "5.19.12",
"@wordpress/escape-html": "2.42.12",
"@wordpress/format-library": "4.19.12",
"@wordpress/hooks": "3.42.12",
"@wordpress/html-entities": "3.42.12",
"@wordpress/i18n": "4.42.12",
"@wordpress/icons": "9.33.12",
"@wordpress/interactivity": "2.3.12",
"@wordpress/interface": "5.19.12",
"@wordpress/is-shallow-equal": "4.42.12",
"@wordpress/keyboard-shortcuts": "4.19.12",
"@wordpress/keycodes": "3.42.12",
"@wordpress/list-reusable-blocks": "4.19.12",
"@wordpress/media-utils": "4.33.12",
"@wordpress/notices": "4.10.12",
"@wordpress/nux": "8.4.12",
"@wordpress/patterns": "1.3.12",
"@wordpress/plugins": "6.10.12",
"@wordpress/preferences": "3.19.12",
"@wordpress/preferences-persistence": "1.34.12",
"@wordpress/primitives": "3.40.12",
"@wordpress/priority-queue": "2.42.12",
"@wordpress/private-apis": "0.24.12",
"@wordpress/redux-routine": "4.42.12",
"@wordpress/reusable-blocks": "4.19.12",
"@wordpress/rich-text": "6.19.12",
"@wordpress/router": "0.11.12",
"@wordpress/server-side-render": "4.19.12",
"@wordpress/shortcode": "3.42.12",
"@wordpress/style-engine": "1.25.12",
"@wordpress/sync": "0.4.12",
"@wordpress/token-list": "2.42.12",
"@wordpress/undo-manager": "0.2.12",
"@wordpress/url": "3.43.12",
"@wordpress/viewport": "5.19.12",
"@wordpress/warning": "2.42.12",
"@wordpress/widgets": "3.19.12",
"@wordpress/wordcount": "3.42.12",
"@wordpress/a11y": "3.42.13",
"@wordpress/annotations": "2.42.13",
"@wordpress/api-fetch": "6.39.13",
"@wordpress/autop": "3.42.13",
"@wordpress/blob": "3.42.13",
"@wordpress/block-directory": "4.19.13",
"@wordpress/block-editor": "12.10.13",
"@wordpress/block-library": "8.19.13",
"@wordpress/block-serialization-default-parser": "4.42.13",
"@wordpress/blocks": "12.19.13",
"@wordpress/commands": "0.13.13",
"@wordpress/components": "25.8.13",
"@wordpress/compose": "6.19.13",
"@wordpress/core-commands": "0.11.13",
"@wordpress/core-data": "6.19.13",
"@wordpress/customize-widgets": "4.19.13",
"@wordpress/data": "9.12.13",
"@wordpress/data-controls": "3.11.13",
"@wordpress/date": "4.42.13",
"@wordpress/deprecated": "3.42.13",
"@wordpress/dom": "3.42.13",
"@wordpress/dom-ready": "3.42.13",
"@wordpress/edit-post": "7.19.13",
"@wordpress/edit-site": "5.19.13",
"@wordpress/edit-widgets": "5.19.13",
"@wordpress/editor": "13.19.13",
"@wordpress/element": "5.19.13",
"@wordpress/escape-html": "2.42.13",
"@wordpress/format-library": "4.19.13",
"@wordpress/hooks": "3.42.13",
"@wordpress/html-entities": "3.42.13",
"@wordpress/i18n": "4.42.13",
"@wordpress/icons": "9.33.13",
"@wordpress/interactivity": "2.3.13",
"@wordpress/interface": "5.19.13",
"@wordpress/is-shallow-equal": "4.42.13",
"@wordpress/keyboard-shortcuts": "4.19.13",
"@wordpress/keycodes": "3.42.13",
"@wordpress/list-reusable-blocks": "4.19.13",
"@wordpress/media-utils": "4.33.13",
"@wordpress/notices": "4.10.13",
"@wordpress/nux": "8.4.13",
"@wordpress/patterns": "1.3.13",
"@wordpress/plugins": "6.10.13",
"@wordpress/preferences": "3.19.13",
"@wordpress/preferences-persistence": "1.34.13",
"@wordpress/primitives": "3.40.13",
"@wordpress/priority-queue": "2.42.13",
"@wordpress/private-apis": "0.24.13",
"@wordpress/redux-routine": "4.42.13",
"@wordpress/reusable-blocks": "4.19.13",
"@wordpress/rich-text": "6.19.13",
"@wordpress/router": "0.11.13",
"@wordpress/server-side-render": "4.19.13",
"@wordpress/shortcode": "3.42.13",
"@wordpress/style-engine": "1.25.13",
"@wordpress/sync": "0.4.13",
"@wordpress/token-list": "2.42.13",
"@wordpress/undo-manager": "0.2.13",
"@wordpress/url": "3.43.13",
"@wordpress/viewport": "5.19.13",
"@wordpress/warning": "2.42.13",
"@wordpress/widgets": "3.19.13",
"@wordpress/wordcount": "3.42.13",
"backbone": "1.5.0",
"clipboard": "2.0.11",
"core-js-url-browser": "3.6.4",
Expand Down
9 changes: 7 additions & 2 deletions src/wp-admin/includes/class-wp-ms-users-list-table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,25 +383,30 @@ public function column_blogs( $user ) {

$path = ( '/' === $site->path ) ? '' : $site->path;
$site_classes = array( 'site-' . $site->site_id );

/**
* Filters the span class for a site listing on the mulisite user list table.
* Filters the span class for a site listing on the multisite user list table.
*
* @since 5.2.0
*
* @param string[] $site_classes Array of class names used within the span tag. Default "site-#" with the site's network ID.
* @param string[] $site_classes Array of class names used within the span tag.
* Default "site-#" with the site's network ID.
* @param int $site_id Site ID.
* @param int $network_id Network ID.
* @param WP_User $user WP_User object.
*/
$site_classes = apply_filters( 'ms_user_list_site_class', $site_classes, $site->userblog_id, $site->site_id, $user );

if ( is_array( $site_classes ) && ! empty( $site_classes ) ) {
$site_classes = array_map( 'sanitize_html_class', array_unique( $site_classes ) );
echo '<span class="' . esc_attr( implode( ' ', $site_classes ) ) . '">';
} else {
echo '<span>';
}

echo '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $site->userblog_id ) ) . '">' . str_replace( '.' . get_network()->domain, '', $site->domain . $path ) . '</a>';
echo ' <small class="row-actions">';

$actions = array();
$actions['edit'] = '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $site->userblog_id ) ) . '">' . __( 'Edit' ) . '</a>';

Expand Down
46 changes: 23 additions & 23 deletions src/wp-admin/includes/template.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2540,20 +2540,20 @@ function compression_test() {
*
* @see get_submit_button()
*
* @param string $text The text of the button (defaults to 'Save Changes')
* @param string $text Optional. The text of the button. Defaults to 'Save Changes'.
* @param string $type Optional. The type and CSS class(es) of the button. Core values
* include 'primary', 'small', and 'large'. Default 'primary'.
* @param string $name The HTML name of the submit button. Defaults to "submit". If no
* id attribute is given in $other_attributes below, $name will be
* used as the button's id.
* @param bool $wrap True if the output button should be wrapped in a paragraph tag,
* false otherwise. Defaults to true.
* @param array|string $other_attributes Other attributes that should be output with the button, mapping
* attributes to their values, such as setting tabindex to 1, etc.
* These key/value attribute pairs will be output as attribute="value",
* where attribute is the key. Other attributes can also be provided
* as a string such as 'tabindex="1"', though the array format is
* preferred. Default null.
* @param string $name Optional. The HTML name of the submit button. If no `id` attribute
* is given in the `$other_attributes` parameter, `$name` will be used
* as the button's `id`. Default 'submit'.
* @param bool $wrap Optional. True if the output button should be wrapped in a paragraph tag,
* false otherwise. Default true.
* @param array|string $other_attributes Optional. Other attributes that should be output with the button,
* mapping attributes to their values, e.g. `array( 'id' => 'search-submit' )`.
* These key/value attribute pairs will be output as `attribute="value"`,
* where attribute is the key. Attributes can also be provided as a string,
* e.g. `id="search-submit"`, though the array format is generally preferred.
* Default null.
*/
function submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null ) {
echo get_submit_button( $text, $type, $name, $wrap, $other_attributes );
Expand All @@ -2564,20 +2564,20 @@ function submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap
*
* @since 3.1.0
*
* @param string $text Optional. The text of the button. Default 'Save Changes'.
* @param string $text Optional. The text of the button. Defaults to 'Save Changes'.
* @param string $type Optional. The type and CSS class(es) of the button. Core values
* include 'primary', 'small', and 'large'. Default 'primary large'.
* @param string $name Optional. The HTML name of the submit button. Defaults to "submit".
* If no id attribute is given in $other_attributes below, `$name` will
* be used as the button's id. Default 'submit'.
* @param bool $wrap Optional. True if the output button should be wrapped in a paragraph
* tag, false otherwise. Default true.
* @param string $name Optional. The HTML name of the submit button. If no `id` attribute
* is given in the `$other_attributes` parameter, `$name` will be used
* as the button's `id`. Default 'submit'.
* @param bool $wrap Optional. True if the output button should be wrapped in a paragraph tag,
* false otherwise. Default true.
* @param array|string $other_attributes Optional. Other attributes that should be output with the button,
* mapping attributes to their values, such as `array( 'tabindex' => '1' )`.
* These attributes will be output as `attribute="value"`, such as
* `tabindex="1"`. Other attributes can also be provided as a string such
* as `tabindex="1"`, though the array format is typically cleaner.
* Default empty.
* mapping attributes to their values, e.g. `array( 'id' => 'search-submit' )`.
* These key/value attribute pairs will be output as `attribute="value"`,
* where attribute is the key. Attributes can also be provided as a string,
* e.g. `id="search-submit"`, though the array format is generally preferred.
* Default empty string.
* @return string Submit button HTML.
*/
function get_submit_button( $text = '', $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = '' ) {
Expand Down
Loading

0 comments on commit 2f0a5cb

Please sign in to comment.