Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 14:53:08 +02:00
Code Issues Projects Releases Wiki Activity

Docs: Remove invalid inline @link tags from docs in wp-admin/includes/media.php.

Browse Source 
See #36910.

Built from https://develop.svn.wordpress.org/trunk@37483


git-svn-id: http://core.svn.wordpress.org/trunk@37451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2016-05-22 17:10:26 +00:00
parent e79d2a1bad
commit c0d7dece23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/includes/media.php
View File

@ -263,11 +263,11 @@ win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
*
* @since 2.5.0
*
* @param string $file_id Index of the {@link $_FILES} array that the file was sent. Required.
* @param string $file_id Index of the $_FILES array that the file was sent. Required.
* @param int $post_id The post ID of a post to attach the media item to. Required, but can
* be set to 0, creating a media item that has no relationship to a post.
* @param array $post_data Overwrite some of the attachment. Optional.
* @param array $overrides Override the {@link wp_handle_upload()} behavior. Optional.
* @param array $overrides Override the wp_handle_upload() behavior. Optional.
* @return int|WP_Error ID of the attachment or a WP_Error object on failure.
*/
function media_handle_upload($file_id, $post_id, $post_data = array(), $overrides = array( 'test_form' => false )) {
@ -380,17 +380,17 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
}
/**
* This handles a sideloaded file in the same way as an uploaded file is handled by {@link media_handle_upload()}
* Handles a side-loaded file in the same way as an uploaded file is handled by media_handle_upload().
*
* @since 2.6.0
*
* @param array $file_array Array similar to a {@link $_FILES} upload array
* @param array $file_array Array similar to a $_FILES upload array
* @param int $post_id The post ID the media is associated with
* @param string $desc Description of the sideloaded file
* @param array $post_data allows you to overwrite some of the attachment
* @return int|object The ID of the attachment or a WP_Error on failure
*/
function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) {
function media_handle_sideload( $file_array, $post_id, $desc = null, $post_data = array() ) {
$overrides = array('test_form'=>false);
$time = current_time( 'mysql' );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-alpha-37482';
$wp_version = '4.6-alpha-37483';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.