diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 0982874712..1291898308 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -736,7 +736,7 @@ function user_row( $user_object, $style = '' ) { $email $short_url"; - $r .= "\n\t\t$numposts"; + $r .= "\n\t\t$numposts"; $r .= "\n\t\t"; if (current_user_can('edit_users')) $r .= "".__('Edit').""; @@ -1559,8 +1559,8 @@ function get_file_description($file) { if (isset ($wp_file_descriptions[basename($file)])) { return $wp_file_descriptions[basename($file)]; } - elseif (file_exists(ABSPATH.$file)) { - $template_data = implode('', file(ABSPATH.$file)); + elseif ( file_exists( ABSPATH . $file ) && is_file( ABSPATH . $file ) ) { + $template_data = implode('', file( ABSPATH . $file )); if (preg_match("|Template Name:(.*)|i", $template_data, $name)) return $name[1]; } @@ -1911,21 +1911,14 @@ function wp_import_cleanup($id) { function wp_import_upload_form($action) { ?> - -
- + +

+ -

- - -
+

+

+ +

- +
- - + + diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index 57fb693ff8..6e36c66402 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -39,7 +39,7 @@ function getNumChecked(form)

-
+
@@ -152,15 +152,17 @@ $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title; if ($comments) { echo ' '; wp_nonce_field('bulk-comments'); - echo '
+ echo '
+ - - - - - + + + + + - '; + +'; foreach ($comments as $comment) { $authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID")); $comment_status = wp_get_comment_status($comment->comment_ID); @@ -183,14 +185,13 @@ $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
*' . __('Name') . '' . __('E-mail') . '' . __('IP') . '' . __('Comment Excerpt') . '' . __('Name') . '' . __('E-mail') . '' . __('IP') . '' . __('Comment Excerpt') . ' ' . __('Actions') . '
comment_post_ID) ) { echo "" . __('Edit') . ""; } ?> comment_post_ID) ) { - echo "comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by "%s".\\n"Cancel" to stop, "OK" to delete."), js_escape( $comment->comment_author )) . "' );\" class='edit'>" . __('Delete') . " "; + echo "comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by "%s".\\n"Cancel" to stop, "OK" to delete."), js_escape( $comment->comment_author )) . "' );\" class='delete'>" . __('Delete') . " "; } ?>
-

-

'); return false } return confirm('')" /> +

'); return false } return confirm('')" /> ')" />

diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php index 005966cf3c..6be18488eb 100644 --- a/wp-admin/edit-pages.php +++ b/wp-admin/edit-pages.php @@ -28,16 +28,14 @@ else if ($posts) { ?> - +
- - - - - - + + + + diff --git a/wp-admin/edit.php b/wp-admin/edit.php index d9904bf908..c6b2604b51 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -133,7 +133,7 @@ $posts_columns['control_delete'] = ''; ?> -
+
@@ -185,7 +185,7 @@ foreach($posts_columns as $column_name=>$column_display_name) { case 'comments': ?> - -
+
+
- - - + + + diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 84dabf2e81..d6edc421cd 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -78,13 +78,15 @@ if (empty($plugins)) { echo '

'; } else { ?> -
+
+ - + - + +

-
- $roleclass) { - ksort($roleclass); - ?> - - - - - - - - - - - - - - - - +

role_names[$role]; ?>

 
$roleclass) { + ksort($roleclass); ?> -
+ + +

role_names[$role]; ?>

+ + + + + + + + + +   + + + + + + +

diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 2b8058e310..7b27c63a59 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -40,6 +40,28 @@ a.delete:hover { overflow: hidden; } +.widefat { + width: 100%; +} + +.widefat td, .widefat th { + padding: 5px 6px; +} + +.import-system { + font-size: 16px; +} + +thead { + background: #dfdfdf +} + +#import-upload-form { + width: 300px; + margin: auto; + text-align: center; +} + a.edit, a.delete, a.edit:hover, a.delete:hover { border-bottom: none; display: block; @@ -366,7 +388,7 @@ form#upload #post_content { clear: both; } -table .vers, table .name { +table .vers { text-align: center; } diff --git a/wp-includes/functions-post.php b/wp-includes/functions-post.php index e684051076..e56dec42b2 100644 --- a/wp-includes/functions-post.php +++ b/wp-includes/functions-post.php @@ -348,7 +348,7 @@ function wp_insert_attachment($object, $file = false, $post_parent = 0) { wp_set_post_cats('', $post_ID, $post_category); if ( $file ) - add_post_meta($post_ID, '_wp_attached_file', $file); + add_post_meta($post_ID, '_wp_attached_file', $file ); clean_post_cache($post_ID);