WordPress 3.7.1

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

diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 7d50d5290daba823ee12f12a1b922bbb26ed4ae5..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.' ) );
@@ -99,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;
@@ -111,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;
@@ -123,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;
@@ -132,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;
 }
 
@@ -173,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">
@@ -247,4 +247,4 @@ if ( !empty($message) ) { ?>
 </div>
 
 <?php
-include('./admin-footer.php');
+include( ABSPATH . 'wp-admin/admin-footer.php' );