enmi-conf.org: comparison wp/wp-includes/meta.php

equal deleted inserted replaced

-:34716fd837a4
+:be944660c56a
 * @param string $meta_type Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
 *                          or any other object type with an associated meta table.
 * @param int    $object_id ID of the object metadata is for.
 * @param string $meta_key  Optional. Metadata key. If not specified, retrieve all metadata for
 *                          the specified object. Default empty.
-* @param bool   $single    Optional. If true, return only the first value of the specified meta_key.
+* @param bool   $single    Optional. If true, return only the first value of the specified `$meta_key`.
-*                          This parameter has no effect if meta_key is not specified. Default false.
+*                          This parameter has no effect if `$meta_key` is not specified. Default false.
-* @return mixed Single metadata value, or array of values.
+* @return mixed An array of values if `$single` is false.
-*               False if there's a problem with the parameters passed to the function.
+*               The value of the meta field if `$single` is true.
+*               False for an invalid `$object_id` (non-numeric, zero, or negative value),
+*               or if `$meta_type` is not specified.
+*               An empty string if a valid but non-existing object ID is passed.
 */
 function get_metadata( $meta_type, $object_id, $meta_key = '', $single = false ) {
 	$value = get_metadata_raw( $meta_type, $object_id, $meta_key, $single );
 	if ( ! is_null( $value ) ) {
 		return $value;
 * @param string $meta_type Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
 *                          or any other object type with an associated meta table.
 * @param int    $object_id ID of the object metadata is for.
 * @param string $meta_key  Optional. Metadata key. If not specified, retrieve all metadata for
 *                          the specified object. Default empty.
-* @param bool   $single    Optional. If true, return only the first value of the specified meta_key.
+* @param bool   $single    Optional. If true, return only the first value of the specified `$meta_key`.
-*                          This parameter has no effect if meta_key is not specified. Default false.
+*                          This parameter has no effect if `$meta_key` is not specified. Default false.
-* @return mixed Single metadata value, or array of values. Null if the value does not exist.
+* @return mixed An array of values if `$single` is false.
-*               False if there's a problem with the parameters passed to the function.
+*               The value of the meta field if `$single` is true.
+*               False for an invalid `$object_id` (non-numeric, zero, or negative value),
+*               or if `$meta_type` is not specified.
+*               Null if the value does not exist.
 */
 function get_metadata_raw( $meta_type, $object_id, $meta_key = '', $single = false ) {
 	if ( ! $meta_type || ! is_numeric( $object_id ) ) {
 		return false;
 	}
 *
 * @param string $meta_type Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
 *                          or any other object type with an associated meta table.
 * @param int    $object_id ID of the object metadata is for.
 * @param string $meta_key  Metadata key.
-* @param bool   $single    Optional. If true, return only the first value of the specified meta_key.
+* @param bool   $single    Optional. If true, return only the first value of the specified `$meta_key`.
-*                          This parameter has no effect if meta_key is not specified. Default false.
+*                          This parameter has no effect if `$meta_key` is not specified. Default false.
-* @return mixed Single metadata value, or array of values.
+* @return mixed An array of default values if `$single` is false.
+*               The default value of the meta field if `$single` is true.
 */
 function get_metadata_default( $meta_type, $object_id, $meta_key, $single = false ) {
 	if ( $single ) {
 		$value = '';
 	} else {
 	if ( ! $object_id ) {
 		return false;
 	}
 	/** This filter is documented in wp-includes/meta.php */
-	$check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, true );
+	$check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, true, $meta_type );
 	if ( null !== $check ) {
 		return (bool) $check;
 	}
 	$meta_cache = wp_cache_get( $object_id, $meta_type . '_meta' );
 	if ( ! $meta_type || ! is_numeric( $meta_id ) || floor( $meta_id ) != $meta_id ) {
 		return false;
 	}
-	$meta_id = intval( $meta_id );
+	$meta_id = (int) $meta_id;
 	if ( $meta_id <= 0 ) {
 		return false;
 	}
 	$table = _get_meta_table( $meta_type );
 *
 * @since 3.3.0
 *
 * @global wpdb $wpdb WordPress database abstraction object.
 *
-* @param string $meta_type  Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
+* @param string       $meta_type  Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
-*                           or any other object type with an associated meta table.
+*                                 or any other object type with an associated meta table.
-* @param int    $meta_id    ID for a specific meta row.
+* @param int          $meta_id    ID for a specific meta row.
-* @param string $meta_value Metadata value. Must be serializable if non-scalar.
+* @param string       $meta_value Metadata value. Must be serializable if non-scalar.
-* @param string $meta_key   Optional. You can provide a meta key to update it. Default false.
+* @param string|false $meta_key   Optional. You can provide a meta key to update it. Default false.
 * @return bool True on successful update, false on failure.
 */
 function update_metadata_by_mid( $meta_type, $meta_id, $meta_value, $meta_key = false ) {
 	global $wpdb;
 	// Make sure everything is valid.
 	if ( ! $meta_type || ! is_numeric( $meta_id ) || floor( $meta_id ) != $meta_id ) {
 		return false;
 	}
-	$meta_id = intval( $meta_id );
+	$meta_id = (int) $meta_id;
 	if ( $meta_id <= 0 ) {
 		return false;
 	}
 	$table = _get_meta_table( $meta_type );
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 * Returning a non-null value will effectively short-circuit the function.
 	 *
 	 * @since 5.0.0
 	 *
-	 * @param null|bool   $check      Whether to allow updating metadata for the given type.
+	 * @param null|bool    $check      Whether to allow updating metadata for the given type.
-	 * @param int         $meta_id    Meta ID.
+	 * @param int          $meta_id    Meta ID.
-	 * @param mixed       $meta_value Meta value. Must be serializable if non-scalar.
+	 * @param mixed        $meta_value Meta value. Must be serializable if non-scalar.
-	 * @param string|bool $meta_key   Meta key, if provided.
+	 * @param string|false $meta_key   Meta key, if provided.
 	 */
 	$check = apply_filters( "update_{$meta_type}_metadata_by_mid", null, $meta_id, $meta_value, $meta_key );
 	if ( null !== $check ) {
 		return (bool) $check;
 	}
 	// Make sure everything is valid.
 	if ( ! $meta_type || ! is_numeric( $meta_id ) || floor( $meta_id ) != $meta_id ) {
 		return false;
 	}
-	$meta_id = intval( $meta_id );
+	$meta_id = (int) $meta_id;
 	if ( $meta_id <= 0 ) {
 		return false;
 	}
 	$table = _get_meta_table( $meta_type );
 	if ( empty( $non_cached_ids ) ) {
 		return $cache;
 	}
 	// Get meta info.
-	$id_list   = join( ',', $non_cached_ids );
+	$id_list   = implode( ',', $non_cached_ids );
 	$id_column = ( 'user' === $meta_type ) ? 'umeta_id' : 'meta_id';
 	$meta_list = $wpdb->get_results( "SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list) ORDER BY $id_column ASC", ARRAY_A );
 	if ( ! empty( $meta_list ) ) {
 		foreach ( $meta_list as $metarow ) {
-			$mpid = intval( $metarow[ $column ] );
+			$mpid = (int) $metarow[ $column ];
 			$mkey = $metarow['meta_key'];
 			$mval = $metarow['meta_value'];
 			// Force subkeys to be array type.
 			if ( ! isset( $cache[ $mpid ] ) || ! is_array( $cache[ $mpid ] ) ) {
 * @param string $meta_type Optional. Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
 *                          or any other object type with an associated meta table. Default empty.
 * @return bool Whether the meta key is considered protected.
 */
 function is_protected_meta( $meta_key, $meta_type = '' ) {
-	$protected = ( '_' === $meta_key[0] );
+	$sanitized_key = preg_replace( "/[^\x20-\x7E\p{L}]/", '', $meta_key );
+	$protected     = strlen( $sanitized_key ) > 0 && ( '_' === $sanitized_key[0] );
 	/**
 	 * Filters whether a meta key is considered protected.
 	 *
 	 * @since 3.2.0
 * @since 5.5.0
 *
 * @param mixed  $value     Current value passed to filter.
 * @param int    $object_id ID of the object metadata is for.
 * @param string $meta_key  Metadata key.
-* @param bool   $single    If true, return only the first value of the specified meta_key.
+* @param bool   $single    If true, return only the first value of the specified `$meta_key`.
-*                          This parameter has no effect if meta_key is not specified.
+*                          This parameter has no effect if `$meta_key` is not specified.
 * @param string $meta_type Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
 *                          or any other object type with an associated meta table.
-* @return mixed Single metadata default, or array of defaults.
+* @return mixed An array of default values if `$single` is false.
+*               The default value of the meta field if `$single` is true.
 */
 function filter_default_metadata( $value, $object_id, $meta_key, $single, $meta_type ) {
 	global $wp_meta_keys;
 	if ( wp_installing() ) {

changeset 18	be944660c56a
parent 16	a86126ab1dd4
child 19	3d72ae0968f4