WordPress 4.0

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

diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 8d3203611759bfa74c2cf866af7e53fd5d492967..241b8fbd3f901302869c6b7d8de0e3649bbe32e9 100644 (file)
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -12,6 +12,12 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
 if ( ! $typenow )
        wp_die( __( 'Invalid post type' ) );
 
+if ( 'attachment' === $typenow ) {
+       if ( wp_redirect( admin_url( 'upload.php' ) ) ) {
+               exit;
+       }
+}
+
 $post_type = $typenow;
 $post_type_object = get_post_type_object( $post_type );
 
@@ -197,7 +203,7 @@ if ( 'post' == $post_type ) {
        get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
        '<p>' . __('<a href="http://codex.wordpress.org/Posts_Screen" target="_blank">Documentation on Managing Posts</a>') . '</p>' .
-       '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
        );
 
 } elseif ( 'page' == $post_type ) {
@@ -218,7 +224,7 @@ if ( 'post' == $post_type ) {
        get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
        '<p>' . __('<a href="http://codex.wordpress.org/Pages_Screen" target="_blank">Documentation on Managing Pages</a>') . '</p>' .
-       '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
        );
 }
 
@@ -265,7 +271,6 @@ $bulk_counts = array_filter( $bulk_counts );
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php
 echo esc_html( $post_type_object->labels->name );
 if ( current_user_can( $post_type_object->cap->create_posts ) )