Merge branch 'trunk' into trac-64238-script-and-style-functions

Author: westonruter

src/wp-admin/customize.php

@@ -147,6 +147,8 @@
 	$body_class .= ' rtl';
 }
 $body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
+$admin_color = get_user_option( 'admin_color' );
+$body_class .= ' admin-color-' . sanitize_html_class( is_string( $admin_color ) ? $admin_color : '', 'fresh' );
 
 if ( wp_use_widgets_block_editor() ) {
 	$body_class .= ' wp-embed-responsive';

src/wp-admin/includes/class-wp-filesystem-direct.php

@@ -249,15 +249,18 @@ public function owner( $file ) {
 	/**
 	 * Gets the permissions of the specified file or filepath in their octal format.
 	 *
-	 * FIXME does not handle errors in fileperms()
-	 *
 	 * @since 2.5.0
 	 *
 	 * @param string $file Path to the file.
-	 * @return string Mode of the file (the last 3 digits).
+	 * @return string Mode of the file (the last 3 digits), or the string "0" on failure.
 	 */
 	public function getchmod( $file ) {
-		return substr( decoct( @fileperms( $file ) ), -3 );
+		$perms = @fileperms( $file );
+		if ( false === $perms ) {
+			return '0';
+		}
+
+		return substr( decoct( $perms ), -3 );
 	}
 
 	/**

src/wp-admin/includes/class-wp-upgrader.php

@@ -590,7 +590,7 @@ public function install_package( $args = array() ) {
 		 * Filters the source file location for the upgrade package.
 		 *
 		 * @since 2.8.0
-		 * @since 4.4.0 The $hook_extra parameter became available.
+		 * @since 4.4.0 The `$hook_extra` parameter became available.
 		 *
 		 * @param string      $source        File source location.
 		 * @param string      $remote_source Remote file source location.

src/wp-admin/includes/media.php

@@ -3769,8 +3769,8 @@ function wp_read_audio_metadata( $file ) {
  * @link https://github.com/JamesHeinrich/getID3/blob/master/structure.txt
  *
  * @param array $metadata The metadata returned by getID3::analyze().
- * @return int|false A UNIX timestamp for the media's creation date if available
- *                   or a boolean FALSE if a timestamp could not be determined.
+ * @return int|false A Unix timestamp for the media's creation date if available
+ *                   or a boolean false if the timestamp could not be determined.
  */
 function wp_get_media_creation_timestamp( $metadata ) {
 	$creation_date = false;

src/wp-admin/includes/post.php

@@ -1894,7 +1894,7 @@ function _admin_notice_post_locked() {
 		 * Fires inside the post locked dialog before the buttons are displayed.
 		 *
 		 * @since 3.6.0
-		 * @since 5.4.0 The $user parameter was added.
+		 * @since 5.4.0 The `$user` parameter was added.
 		 *
 		 * @param WP_Post $post Post object.
 		 * @param WP_User $user The user with the lock for the post.

src/wp-admin/widgets-form.php

@@ -187,9 +187,9 @@
 
 	// Remove old position.
 	if ( ! isset( $_POST['delete_widget'] ) ) {
-		foreach ( $sidebars_widgets as $sidebar_id => $sidebar ) {
-			if ( is_array( $sidebar ) ) {
-				$sidebars_widgets[ $sidebar_id ] = array_diff( $sidebar, array( $widget_id ) );
+		foreach ( $sidebars_widgets as $sidebar_widget_id => $sidebar_widget ) {
+			if ( is_array( $sidebar_widget ) ) {
+				$sidebars_widgets[ $sidebar_widget_id ] = array_diff( $sidebar_widget, array( $widget_id ) );
 			}
 		}
 

src/wp-content/themes/twentynineteen/style-editor.css

@@ -1095,3 +1095,9 @@ $group-block-background__padding: $font__size_base;
 .wp-block-post-author__avatar img {
 	border-radius: 100%;
 }
+
+/** === Calendar Block === */
+
+.wp-calendar-table {
+	@include font-family( $font__heading );
+}

src/wp-content/themes/twentynineteen/style-editor.scss

@@ -277,13 +277,15 @@ protected function prepare_properties( array $args ): array {
 			);
 		}
 
-		if ( empty( $args['execute_callback'] ) || ! is_callable( $args['execute_callback'] ) ) {
+		// If we are not overriding `ability_class` parameter during instantiation, then we need to validate the execute_callback.
+		if ( get_class( $this ) === self::class && ( empty( $args['execute_callback'] ) || ! is_callable( $args['execute_callback'] ) ) ) {
 			throw new InvalidArgumentException(
 				__( 'The ability properties must contain a valid `execute_callback` function.' )
 			);
 		}
 
-		if ( empty( $args['permission_callback'] ) || ! is_callable( $args['permission_callback'] ) ) {
+		// If we are not overriding `ability_class` parameter during instantiation, then we need to validate the permission_callback.
+		if ( get_class( $this ) === self::class && ( empty( $args['permission_callback'] ) || ! is_callable( $args['permission_callback'] ) ) ) {
 			throw new InvalidArgumentException(
 				__( 'The ability properties must provide a valid `permission_callback` function.' )
 			);

src/wp-includes/abilities-api/class-wp-ability.php

@@ -765,7 +765,7 @@ public function value() {
 			 * functions for available hooks.
 			 *
 			 * @since 3.4.0
-			 * @since 4.6.0 Added the `$this` setting instance as the second parameter.
+			 * @since 4.6.0 Added the `$setting` instance as the second parameter.
 			 *
 			 * @param mixed                $default_value The setting default value. Default empty.
 			 * @param WP_Customize_Setting $setting       The setting instance.