From 121f83ab39eb86bec6232b39a46789297acbf7a9 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Tue, 3 Feb 2015 07:47:22 +0000 Subject: [PATCH] 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 --- wp-admin/media-upload.php | 125 +++++++++++++++++++------------------- wp-includes/version.php | 2 +- 2 files changed, 65 insertions(+), 62 deletions(-) diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php index 5c769e01e1..2792b25f17 100644 --- a/wp-admin/media-upload.php +++ b/wp-admin/media-upload.php @@ -31,70 +31,73 @@ $ID = isset($ID) ? (int) $ID : 0; $post_id = isset($post_id)? (int) $post_id : 0; // Require an ID for the edit screen. -if ( isset($action) && $action == 'edit' && !$ID ) +if ( isset($action) && $action == 'edit' && !$ID ) { wp_die( __( 'Cheatin’ uh?' ), 403 ); +} - if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) - wp_die( __( 'Cheatin’ uh?' ), 403 ); +if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) { + wp_die( __( 'Cheatin’ uh?' ), 403 ); +} - // Upload type: image, video, file, ..? - if ( isset($_GET['type']) ) { - $type = strval($_GET['type']); - } else { - /** - * Filter the default media upload type in the legacy (pre-3.5.0) media popup. - * - * @since 2.5.0 - * - * @param string $type The default media upload type. Possible values include - * 'image', 'audio', 'video', 'file', etc. Default 'file'. - */ - $type = apply_filters( 'media_upload_default_type', 'file' ); - } +// Upload type: image, video, file, ..? +if ( isset($_GET['type']) ) { + $type = strval($_GET['type']); +} else { + /** + * Filter the default media upload type in the legacy (pre-3.5.0) media popup. + * + * @since 2.5.0 + * + * @param string $type The default media upload type. Possible values include + * 'image', 'audio', 'video', 'file', etc. Default 'file'. + */ + $type = apply_filters( 'media_upload_default_type', 'file' ); +} - // Tab: gallery, library, or type-specific. - if ( isset($_GET['tab']) ) { - $tab = strval($_GET['tab']); - } else { - /** - * Filter the default tab in the legacy (pre-3.5.0) media popup. - * - * @since 2.5.0 - * - * @param string $type The default media popup tab. Default 'type' (From Computer). - */ - $tab = apply_filters( 'media_upload_default_tab', 'type' ); - } +// Tab: gallery, library, or type-specific. +if ( isset($_GET['tab']) ) { + $tab = strval($_GET['tab']); +} else { + /** + * Filter the default tab in the legacy (pre-3.5.0) media popup. + * + * @since 2.5.0 + * + * @param string $type The default media popup tab. Default 'type' (From Computer). + */ + $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" ); - } diff --git a/wp-includes/version.php b/wp-includes/version.php index da0db59d46..de1c79562e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @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.