Wordpress 3.7

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

diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index d1723274740b3c0a10181641cf6bc606279f2769..64d0f84676556b3f170fb1008ad3fbe6e058e62a 100644 (file)
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -7,7 +7,7 @@
  */
 
 /** WordPress Administration Bootstrap */
-require_once( './admin.php' );
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( !current_user_can('upload_files') )
        wp_die( __( 'You do not have permission to upload files.' ) );
@@ -57,7 +57,7 @@ if ( $doaction ) {
                        if ( !$parent_id )
                                return;
 
-                       $parent = &get_post( $parent_id );
+                       $parent = get_post( $parent_id );
                        if ( !current_user_can( 'edit_post', $parent_id ) )
                                wp_die( __( 'You are not allowed to edit this post.' ) );
 
@@ -69,12 +69,14 @@ if ( $doaction ) {
                                        continue;
 
                                $attach[] = $att_id;
-                               clean_attachment_cache( $att_id );
                        }
 
                        if ( ! empty( $attach ) ) {
-                               $attach = implode( ',', $attach );
-                               $attached = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $attach )", $parent_id ) );
+                               $attach_string = implode( ',', $attach );
+                               $attached = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $attach_string )", $parent_id ) );
+                               foreach ( $attach as $att_id ) {
+                                       clean_attachment_cache( $att_id );
+                               }
                        }
 
                        if ( isset( $attached ) ) {
@@ -97,7 +99,7 @@ if ( $doaction ) {
                                        wp_die( __( 'You are not allowed to move this post to the trash.' ) );
 
                                if ( !wp_trash_post( $post_id ) )
-                                       wp_die( __( 'Error in moving to trash...' ) );
+                                       wp_die( __( 'Error in moving to trash.' ) );
                        }
                        $location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
                        break;
@@ -109,7 +111,7 @@ if ( $doaction ) {
                                        wp_die( __( 'You are not allowed to move this post out of the trash.' ) );
 
                                if ( !wp_untrash_post( $post_id ) )
-                                       wp_die( __( 'Error in restoring from trash...' ) );
+                                       wp_die( __( 'Error in restoring from trash.' ) );
                        }
                        $location = add_query_arg( 'untrashed', count( $post_ids ), $location );
                        break;
@@ -121,7 +123,7 @@ if ( $doaction ) {
                                        wp_die( __( 'You are not allowed to delete this post.' ) );
 
                                if ( !wp_delete_attachment( $post_id_del ) )
-                                       wp_die( __( 'Error in deleting...' ) );
+                                       wp_die( __( 'Error in deleting.' ) );
                        }
                        $location = add_query_arg( 'deleted', count( $post_ids ), $location );
                        break;
@@ -130,7 +132,7 @@ if ( $doaction ) {
        wp_redirect( $location );
        exit;
 } elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
-        wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), stripslashes( $_SERVER['REQUEST_URI'] ) ) );
+        wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
         exit;
 }
 
@@ -171,7 +173,7 @@ get_current_screen()->set_help_sidebar(
        '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
 );
 
-require_once('./admin-header.php');
+require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
@@ -245,4 +247,4 @@ if ( !empty($message) ) { ?>
 </div>
 
 <?php
-include('./admin-footer.php');
+include( ABSPATH . 'wp-admin/admin-footer.php' );