WordPress 3.4

[autoinstalls/wordpress.git] / wp-admin / media-upload.php

diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index 666c3f37e252a178b0797a1dc235ba7f2bbfa869..6246176b88399343f469276f4e8242223526f74d 100644 (file)
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -22,6 +22,7 @@ wp_enqueue_script('plupload-handlers');
 wp_enqueue_script('image-edit');
 wp_enqueue_script('set-post-thumbnail' );
 wp_enqueue_style('imgareaselect');
 wp_enqueue_script('image-edit');
 wp_enqueue_script('set-post-thumbnail' );
 wp_enqueue_style('imgareaselect');

+wp_enqueue_script( 'media-gallery' );

 
 @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 
 
 @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 


@@ -31,11 +32,14 @@ $post_id = isset($post_id)? (int) $post_id : 0;
 
 // Require an ID for the edit screen
 if ( isset($action) && $action == 'edit' && !$ID )
 
 // Require an ID for the edit screen
 if ( isset($action) && $action == 'edit' && !$ID )

-       wp_die(__("You are not allowed to be here"));
+       wp_die( __( 'Cheatin’ uh?' ) );

 
 if ( isset($_GET['inline']) ) {
        $errors = array();
 
 
 if ( isset($_GET['inline']) ) {
        $errors = array();
 

+       if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )
+               wp_die( __( 'Cheatin’ uh?' ) );
+

        if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
                check_admin_referer('media-form');
                // Upload File button was clicked
        if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
                check_admin_referer('media-form');
                // Upload File button was clicked


@@ -58,6 +62,9 @@ if ( isset($_GET['inline']) ) {
                exit;
        }
 
                exit;
        }
 

+       if ( isset( $_REQUEST['post_id'] ) )
+               wp_die( __( 'Cheatin’ uh?' ) );
+

        $title = __('Upload New Media');
        $parent_file = 'upload.php';
        get_current_screen()->add_help_tab( array(
        $title = __('Upload New Media');
        $parent_file = 'upload.php';
        get_current_screen()->add_help_tab( array(


@@ -67,8 +74,8 @@ if ( isset($_GET['inline']) ) {
                '<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '</p>' .
                '<ul>' .
                        '<li>' . __('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.') . '</li>' .
                '<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '</p>' .
                '<ul>' .
                        '<li>' . __('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.') . '</li>' .

-                       '<li>' . __('<strong>Select Files</strong> will open the multi-file uploader, or you can use the <strong>Browser Uploader</strong>.') . '</li>' .

                        '<li>' . __('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.') . '</li>' .
                        '<li>' . __('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.') . '</li>' .

+                       '<li>' . __('Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.') . '</li>' .

                '</ul>' .
                '<p>' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '</p>'
        ) );
                '</ul>' .
                '<p>' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '</p>'
        ) );


@@ -115,6 +122,8 @@ if ( isset($_GET['inline']) ) {
        include('./admin-footer.php');
 
 } else {
        include('./admin-footer.php');
 
 } else {

+       if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )
+               wp_die( __( 'Cheatin&#8217; uh?' ) );

 
        // upload type: image, video, file, ..?
        if ( isset($_GET['type']) )
 
        // upload type: image, video, file, ..?
        if ( isset($_GET['type']) )


@@ -136,4 +145,3 @@ if ( isset($_GET['inline']) ) {
        else
                do_action("media_upload_$tab");
 }
        else
                do_action("media_upload_$tab");
 }

-?>