diff options
Diffstat (limited to 'wp-admin')
| -rw-r--r-- | wp-admin/admin-functions.php | 4 | ||||
| -rw-r--r-- | wp-admin/categories.php | 2 | ||||
| -rw-r--r-- | wp-admin/edit-comments.php | 2 | ||||
| -rw-r--r-- | wp-admin/index.php | 2 | ||||
| -rw-r--r-- | wp-admin/link-import.php | 2 | ||||
| -rw-r--r-- | wp-admin/link-manager.php | 8 | ||||
| -rw-r--r-- | wp-admin/rtl.css | 26 | ||||
| -rw-r--r-- | wp-admin/wpmu-blogs.php | 47 |
8 files changed, 39 insertions, 54 deletions
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 79fe7e4..a7b0428 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -709,7 +709,7 @@ function get_nested_categories( $default = 0, $parent = 0 ) { function write_nested_categories( $categories ) { foreach ( $categories as $category ) { - echo '<li id="category-', $category['cat_ID'], '"><label for="in-category-', $category['cat_ID'], '" class="selectit"><input value="', $category['cat_ID'], '" type="checkbox" name="post_category[]" id="in-category-', $category['cat_ID'], '"', ($category['checked'] ? ' checked="checked"' : "" ), '/> ', wp_specialchars( $category['cat_name'] ), "</label></li>"; + echo '<li id="category-', $category['cat_ID'], '"><label for="in-category-', $category['cat_ID'], '" class="selectit"><input value="', $category['cat_ID'], '" type="checkbox" name="post_category[]" id="in-category-', $category['cat_ID'], '"', ($category['checked'] ? ' checked="checked"' : "" ), '/> ', wp_specialchars( apply_filters('the_category', $category['cat_name'] )), "</label></li>"; if ( $category['children'] ) { echo "<ul>\n"; @@ -769,7 +769,7 @@ function dropdown_link_categories( $default = 0 ) { // Dandy new recursive multiple category stuff. function cat_rows( $parent = 0, $level = 0, $categories = 0 ) { - global $wpdb, $class; + global $wpdb; if (!$categories ) $categories = get_categories( 'hide_empty=0' ); diff --git a/wp-admin/categories.php b/wp-admin/categories.php index f7a04f9..08e80c3 100644 --- a/wp-admin/categories.php +++ b/wp-admin/categories.php @@ -114,7 +114,7 @@ cat_rows(); <?php if ( current_user_can('manage_categories') ) : ?> <div class="wrap"> -<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts and links in that category. Instead, posts in the deleted category are set to the category <strong>%s</strong> and links are set to <strong>%s</strong>.'), get_catname(get_option('default_category')), get_catname(get_option('default_link_category'))) ?></p> +<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts and links in that category. Instead, posts in the deleted category are set to the category <strong>%s</strong> and links are set to <strong>%s</strong>.'), apply_filters('the_category', get_catname(get_option('default_category'))), apply_filters('the_category', get_catname(get_option('default_link_category')))) ?></p> </div> <?php include('edit-category-form.php'); ?> diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index 4ba2479..d3de2c5 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -168,7 +168,7 @@ $post = get_post($comment->comment_post_ID); $post_title = wp_specialchars( $post->post_title, 'double' ); $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title; ?> - | <a href="<?php echo get_permalink($comment->comment_post_ID); ?>" title="<?php echo $post_title; ?>"><?php _e('View Post') ?></a> ]</p> + ] — <a href="<?php echo get_permalink($comment->comment_post_ID); ?>"><?php echo $post_title; ?></a></p> </li> <?php } // end foreach($comment) ?> diff --git a/wp-admin/index.php b/wp-admin/index.php index 0988ed7..2a24a82 100644 --- a/wp-admin/index.php +++ b/wp-admin/index.php @@ -50,7 +50,7 @@ if ( $comments || $numcomments ) : <?php if ( $comments ) { foreach ($comments as $comment) { - echo '<li>' . sprintf(__('%1$s on %2$s'), get_comment_author_link(), '<a href="'. get_permalink($comment->comment_post_ID) . '#comment-' . $comment->comment_ID . '">' . get_the_title($comment->comment_post_ID) . '</a>'); + echo '<li>' . sprintf(__('%1$s on %2$s'), get_comment_author_link(), '<a href="'. get_permalink($comment->comment_post_ID) . '#comment-' . $comment->comment_ID . '">' . apply_filters('the_title', get_the_title($comment->comment_post_ID)) . '</a>'); edit_comment_link(__("Edit"), ' <small>(', ')</small>'); echo '</li>'; } diff --git a/wp-admin/link-import.php b/wp-admin/link-import.php index f1f971d..2c8accf 100644 --- a/wp-admin/link-import.php +++ b/wp-admin/link-import.php @@ -48,7 +48,7 @@ switch ($step) { $categories = get_categories('hide_empty=0'); foreach ($categories as $category) { ?> -<option value="<?php echo $category->cat_ID; ?>"><?php echo wp_specialchars($category->cat_name); ?></option> +<option value="<?php echo $category->cat_ID; ?>"><?php echo wp_specialchars(apply_filters('link_category', $category->cat_name)); ?></option> <?php } // end foreach ?> diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index 63a2c90..8b0a4ee 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -80,7 +80,7 @@ $categories = get_categories("hide_empty=1&type=link"); $select_cat = "<select name=\"cat_id\">\n"; $select_cat .= '<option value="all"' . (($cat_id == 'all') ? " selected='selected'" : '') . '>' . __('All') . "</option>\n"; foreach ((array) $categories as $cat) - $select_cat .= '<option value="' . $cat->cat_ID . '"' . (($cat->cat_ID == $cat_id) ? " selected='selected'" : '') . '>' . wp_specialchars($cat->cat_name) . "</option>\n"; + $select_cat .= '<option value="' . $cat->cat_ID . '"' . (($cat->cat_ID == $cat_id) ? " selected='selected'" : '') . '>' . wp_specialchars(apply_filters('link_category', $cat->cat_name)) . "</option>\n"; $select_cat .= "</select>\n"; $select_order = "<select name=\"order_by\">\n"; @@ -131,8 +131,8 @@ if ( $links ) { <tbody id="the-list"> <?php foreach ($links as $link) { - $link->link_name = attribute_escape($link->link_name); - $link->link_description = wp_specialchars($link->link_description); + $link->link_name = attribute_escape(apply_filters('link_title', $link->link_name)); + $link->link_description = wp_specialchars(apply_filters('link_description', $link->link_description)); $link->link_url = attribute_escape($link->link_url); $link->link_category = wp_get_link_cats($link->link_id); $short_url = str_replace('http://', '', $link->link_url); @@ -160,7 +160,7 @@ if ( $links ) { $cat_names = array(); foreach ($link->link_category as $category) { $cat_name = get_the_category_by_ID($category); - $cat_name = wp_specialchars($cat_name); + $cat_name = wp_specialchars(apply_filters('link_category', $cat_name)); if ( $cat_id != $category ) $cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>"; $cat_names[] = $cat_name; diff --git a/wp-admin/rtl.css b/wp-admin/rtl.css index ad4af49..3fdf6b5 100644 --- a/wp-admin/rtl.css +++ b/wp-admin/rtl.css @@ -42,9 +42,11 @@ textarea, input, select { font: 13px Tahoma, Verdana, Arial, Helvetica, sans-se #adminmenu { padding: .2em 2em .3em .2em; - height: 30px; + height: 28px; } +#adminmenu li { line-height: 160%; } + #adminmenu a { margin: 0 0 0 10px; display: block; @@ -56,23 +58,22 @@ textarea, input, select { font: 13px Tahoma, Verdana, Arial, Helvetica, sans-se border-left: 2px solid #4f96c8; } -#adminmenu li { line-height: 180%; } +#submenu, #minisub { padding: 1px 3em 0 2em; } -#submenu, #minisub { padding: 3px 3em 0 2em; } +#submenu { height: 28px; } -#submenu .current { - border-right: 0; - border-left: 2px solid #045290; -} +#submenu li { line-height: 160%; } #submenu a { - padding: .3em .4em .4em .4em; margin: 0 0 0 10px; display: block; float: right; } -#submenu li { line-height: 120%; } +#submenu .current { + border-right: 0; + border-left: 2px solid #045290; +} #currenttheme img { float: right; @@ -90,7 +91,12 @@ textarea, input, select { font: 13px Tahoma, Verdana, Arial, Helvetica, sans-se margin-left: 5em; } -* html #postexcerpt .dbx-toggle-open, * html #postexcerpt .dbx-toggle-open, #postexcerpt div, #attachmentlinks div { +#postexcerpt div, #attachmentlinks div { + margin-right: auto; + margin-left: 8px; +} + +* html #postexcerpt .dbx-toggle-open { padding-right: 0; padding-left: 8px; } diff --git a/wp-admin/wpmu-blogs.php b/wp-admin/wpmu-blogs.php index 87b1f55..bfcb52c 100644 --- a/wp-admin/wpmu-blogs.php +++ b/wp-admin/wpmu-blogs.php @@ -78,42 +78,21 @@ switch( $_GET[ 'action' ] ) { </td></tr> <?php while( list( $key, $val ) = each( $options ) ) { - $kellog = @unserialize( $val[ 'option_value' ] ); - if( is_array( $kellog ) ) { - print '<tr valign="top"> - <th scope="row">' . ucwords( str_replace( "_", " ", $val[ 'option_name' ] ) ) . '</th> - <td>'; - print '<textarea rows="5" cols="40" disabled>'; - reset( $kellog ); - while( list( $key, $val ) = each( $kellog ) ) - { - if( is_array( $val ) ) { - print "$key:\n"; - while( list( $k, $v ) = each( $val ) ) { - if( is_array( $v ) ) { - print " $k:\n"; - while( list( $k1, $v1 ) = each( $v ) ) { - print " $k1 -> $v1\n"; - } - } else { - if( $v1 != '' ) - print " $k1 -> $v1\n"; - } - } - } else { - if( $val != '' ) - print "$key -> $val\n"; - } + $disabled = ''; + if ( is_serialized($val[ 'option_value' ]) ) { + if ( is_serialized_string($val[ 'option_value' ]) ) { + $val[ 'option_value' ] = wp_specialchars(maybe_unserialize($val[ 'option_value' ]), 'single'); + } else { + $val[ 'option_value' ] = "SERIALIZED DATA"; + $disabled = ' disabled="disabled"'; } - print '</textarea></td></tr>'; - } else { - ?> - <tr valign="top"> - <th scope="row"><?php echo ucwords( str_replace( "_", " ", $val[ 'option_name' ] ) ) ?></th> - <td><input name="option[<?php echo $val[ 'option_name' ] ?>]" type="text" id="<?php echo $val[ 'option_name' ] ?>" value="<?php echo wp_specialchars( stripslashes( $val[ 'option_value' ] ), 1 ) ?>" size="40" /></td> - </tr> - <?php } + ?> + <tr valign="top"> + <th scope="row"><?php echo ucwords( str_replace( "_", " ", $val[ 'option_name' ] ) ) ?></th> + <td><input name="option[<?php echo $val[ 'option_name' ] ?>]" type="text" id="<?php echo $val[ 'option_name' ] ?>" value="<?php echo wp_specialchars( stripslashes( $val[ 'option_value' ] ), 1 ) ?>" size="40" <?php echo $disabled ?>/></td> + </tr> + <?php } ?> </table> |