WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove an extra indent from most of media-new.php. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@31309 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2015-02-03 07:47:22 +00:00
parent e8f032c747
commit 121f83ab39
2 changed files with 65 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
wp-admin/media-upload.php
View File

@ -31,70 +31,73 @@ $ID = isset($ID) ? (int) $ID : 0;
$post_id = isset($post_id)? (int) $post_id : 0; $post_id = isset($post_id)? (int) $post_id : 0;
// Require an ID for the edit screen. // Require an ID for the edit screen.
if ( isset($action) && $action == 'edit' && !$ID ) if ( isset($action) && $action == 'edit' && !$ID ) {
wp_die( __( 'Cheatin’ uh?' ), 403 ); wp_die( __( 'Cheatin’ uh?' ), 403 );
}
if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) {
wp_die( __( 'Cheatin’ uh?' ), 403 ); wp_die( __( 'Cheatin’ uh?' ), 403 );
}
// Upload type: image, video, file, ..? // Upload type: image, video, file, ..?
if ( isset($_GET['type']) ) { if ( isset($_GET['type']) ) {
$type = strval($_GET['type']); $type = strval($_GET['type']);
} else { } else {
/** /**
* Filter the default media upload type in the legacy (pre-3.5.0) media popup. * Filter the default media upload type in the legacy (pre-3.5.0) media popup.
* *
* @since 2.5.0 * @since 2.5.0
* *
* @param string $type The default media upload type. Possible values include * @param string $type The default media upload type. Possible values include
* 'image', 'audio', 'video', 'file', etc. Default 'file'. * 'image', 'audio', 'video', 'file', etc. Default 'file'.
*/ */
$type = apply_filters( 'media_upload_default_type', 'file' ); $type = apply_filters( 'media_upload_default_type', 'file' );
} }
// Tab: gallery, library, or type-specific. // Tab: gallery, library, or type-specific.
if ( isset($_GET['tab']) ) { if ( isset($_GET['tab']) ) {
$tab = strval($_GET['tab']); $tab = strval($_GET['tab']);
} else { } else {
/** /**
* Filter the default tab in the legacy (pre-3.5.0) media popup. * Filter the default tab in the legacy (pre-3.5.0) media popup.
* *
* @since 2.5.0 * @since 2.5.0
* *
* @param string $type The default media popup tab. Default 'type' (From Computer). * @param string $type The default media popup tab. Default 'type' (From Computer).
*/ */
$tab = apply_filters( 'media_upload_default_tab', 'type' ); $tab = apply_filters( 'media_upload_default_tab', 'type' );
} }
$body_id = 'media-upload'; $body_id = 'media-upload';
// Let the action code decide how to handle the request.
if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) ) {
/**
* Fires inside specific upload-type views in the legacy (pre-3.5.0)
* media popup based on the current tab.
*
* The dynamic portion of the hook name, `$type`, refers to the specific
* media upload type. Possible values include 'image', 'audio', 'video',
* 'file', etc.
*
* The hook only fires if the current `$tab` is 'type' (From Computer),
* 'type_url' (From URL), or, if the tab does not exist (i.e., has not
* been registered via the {@see 'media_upload_tabs'} filter.
*
* @since 2.5.0
*/
do_action( "media_upload_$type" );
} else {
/**
* Fires inside limited and specific upload-tab views in the legacy
* (pre-3.5.0) media popup.
*
* The dynamic portion of the hook name, `$tab`, refers to the specific
* media upload tab. Possible values include 'library' (Media Library),
* or any custom tab registered via the {@see 'media_upload_tabs'} filter.
*
* @since 2.5.0
*/
do_action( "media_upload_$tab" );
}
// Let the action code decide how to handle the request.
if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) ) {
/**
* Fires inside specific upload-type views in the legacy (pre-3.5.0)
* media popup based on the current tab.
*
* The dynamic portion of the hook name, `$type`, refers to the specific
* media upload type. Possible values include 'image', 'audio', 'video',
* 'file', etc.
*
* The hook only fires if the current `$tab` is 'type' (From Computer),
* 'type_url' (From URL), or, if the tab does not exist (i.e., has not
* been registered via the {@see 'media_upload_tabs'} filter.
*
* @since 2.5.0
*/
do_action( "media_upload_$type" );
} else {
/**
* Fires inside limited and specific upload-tab views in the legacy
* (pre-3.5.0) media popup.
*
* The dynamic portion of the hook name, `$tab`, refers to the specific
* media upload tab. Possible values include 'library' (Media Library),
* or any custom tab registered via the {@see 'media_upload_tabs'} filter.
*
* @since 2.5.0
*/
do_action( "media_upload_$tab" );
}

2
wp-includes/version.php
View File

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