Bring out the pinking shears.

git-svn-id: http://svn.automattic.com/wordpress/trunk@18254 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-06-10 23:01:45 +00:00
parent 3a29a3d893
commit daa14c36f9
22 changed files with 54 additions and 54 deletions

View File

@ -41,8 +41,8 @@
clear: left; clear: left;
} }
#dashboard_plugins .inside span { #dashboard_plugins .inside span {
padding-left: 0; padding-left: 0;
padding-right: 5px; padding-right: 5px;
} }
#dashboard-widgets h3 .postbox-title-action { #dashboard-widgets h3 .postbox-title-action {
right: auto; right: auto;

View File

@ -91,7 +91,7 @@
/* Button Secondary Actions */ /* Button Secondary Actions */
.list-controls { .list-controls {
float: right; float: right;
} }
.add-to-menu { .add-to-menu {
float: left; float: left;

View File

@ -288,7 +288,7 @@ class WP_List_Table {
echo "<select name='action$two'>\n"; echo "<select name='action$two'>\n";
echo "<option value='-1' selected='selected'>" . __( 'Bulk Actions' ) . "</option>\n"; echo "<option value='-1' selected='selected'>" . __( 'Bulk Actions' ) . "</option>\n";
foreach ( $this->_actions as $name => $title ) { foreach ( $this->_actions as $name => $title ) {
$class = 'edit' == $name ? ' class="hide-if-no-js"' : ''; $class = 'edit' == $name ? ' class="hide-if-no-js"' : '';

View File

@ -192,7 +192,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
$actions['delete'] = '<a href="' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user->ID ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>'; $actions['delete'] = '<a href="' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user->ID ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>';
} }
$actions = apply_filters( 'ms_user_row_actions', $actions, $user ); $actions = apply_filters( 'ms_user_row_actions', $actions, $user );
echo $this->row_actions( $actions ); echo $this->row_actions( $actions );
?> ?>
</td> </td>

View File

@ -31,7 +31,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
'plural' => 'plugins', 'plural' => 'plugins',
) ); ) );
} }
function get_table_classes() { function get_table_classes() {
return array( 'widefat', $this->_args['plural'] ); return array( 'widefat', $this->_args['plural'] );
} }

View File

@ -1058,7 +1058,7 @@ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = ar
array_unshift( $args, $widget_id ); array_unshift( $args, $widget_id );
ob_start(); ob_start();
call_user_func_array( $callback, $args ); call_user_func_array( $callback, $args );
set_transient( $cache_key, ob_get_flush(), 43200); // Default lifetime in cache of 12 hours (same as the feeds) set_transient( $cache_key, ob_get_flush(), 43200); // Default lifetime in cache of 12 hours (same as the feeds)
} }
return true; return true;

View File

@ -1581,7 +1581,7 @@ function wp_tiny_mce( $teeny = false, $settings = false ) {
'paste_text_use_dialog' => true, 'paste_text_use_dialog' => true,
'extended_valid_elements' => 'article[*],aside[*],audio[*],canvas[*],command[*],datalist[*],details[*],embed[*],figcaption[*],figure[*],footer[*],header[*],hgroup[*],keygen[*],mark[*],meter[*],nav[*],output[*],progress[*],section[*],source[*],summary,time[*],video[*],wbr', 'extended_valid_elements' => 'article[*],aside[*],audio[*],canvas[*],command[*],datalist[*],details[*],embed[*],figcaption[*],figure[*],footer[*],header[*],hgroup[*],keygen[*],mark[*],meter[*],nav[*],output[*],progress[*],section[*],source[*],summary,time[*],video[*],wbr',
'wpeditimage_disable_captions' => $no_captions, 'wpeditimage_disable_captions' => $no_captions,
'wp_fullscreen_content_css' => "$baseurl/plugins/wpfullscreen/css/wp-fullscreen.css", 'wp_fullscreen_content_css' => "$baseurl/plugins/wpfullscreen/css/wp-fullscreen.css",
'plugins' => implode( ',', $plugins ), 'plugins' => implode( ',', $plugins ),
); );
@ -1738,9 +1738,9 @@ function wp_preload_dialogs($init) {
function wp_quicktags() { function wp_quicktags() {
global $tinymce_version; global $tinymce_version;
wp_preload_dialogs( array( 'plugins' => 'wpdialogs,wplink,wpfullscreen' ) ); wp_preload_dialogs( array( 'plugins' => 'wpdialogs,wplink,wpfullscreen' ) );
if ( !user_can_richedit() ) { if ( !user_can_richedit() ) {
wp_enqueue_style( 'tinymce-buttons', includes_url('js/tinymce/themes/advanced/skins/wp_theme/ui.css'), array(), $tinymce_version ); wp_enqueue_style( 'tinymce-buttons', includes_url('js/tinymce/themes/advanced/skins/wp_theme/ui.css'), array(), $tinymce_version );
wp_print_styles('tinymce-buttons'); wp_print_styles('tinymce-buttons');
@ -1793,7 +1793,7 @@ function wp_fullscreen_html() {
$buttons = apply_filters( 'wp_fullscreen_buttons', $buttons ); $buttons = apply_filters( 'wp_fullscreen_buttons', $buttons );
foreach ( $buttons as $button => $args ) { foreach ( $buttons as $button => $args ) {
if ( 'separator' == $args ) { ?> if ( 'separator' == $args ) { ?>
<div><span aria-orientation="vertical" role="separator" class="mceSeparator"></span></div> <div><span aria-orientation="vertical" role="separator" class="mceSeparator"></span></div>
<?php continue; <?php continue;
} ?> } ?>

View File

@ -249,7 +249,7 @@ $_old_files = array(
* *
* The contents of this array indicate any new bundled plugins/themes which * The contents of this array indicate any new bundled plugins/themes which
* should be installed with the WordPress Upgrade. These items will not be * should be installed with the WordPress Upgrade. These items will not be
* re-installed in future upgrades, this behaviour is controlled by the * re-installed in future upgrades, this behaviour is controlled by the
* introduced version present here being older than the current installed version. * introduced version present here being older than the current installed version.
* *
* The content of this array should follow the following format: * The content of this array should follow the following format:

View File

@ -500,7 +500,7 @@ commentReply = {
if ( r.supplemental.parent_approved ) { if ( r.supplemental.parent_approved ) {
pid = $('#comment-' + r.supplemental.parent_approved); pid = $('#comment-' + r.supplemental.parent_approved);
updatePending( getCount( $('span.pending-count').eq(0) ) - 1 ); updatePending( getCount( $('span.pending-count').eq(0) ) - 1 );
if ( this.comments_listing == 'moderated' ) { if ( this.comments_listing == 'moderated' ) {
pid.animate( { 'backgroundColor':'#CCEEBB' }, 400, function(){ pid.animate( { 'backgroundColor':'#CCEEBB' }, 400, function(){
pid.fadeOut(); pid.fadeOut();
@ -513,7 +513,7 @@ commentReply = {
$('#replyrow').after(c); $('#replyrow').after(c);
id = $(id); id = $(id);
t.addEvents(id); t.addEvents(id);
bg = id.hasClass('unapproved') ? '#FFFFE0' : id.closest('.widefat').css('backgroundColor'); bg = id.hasClass('unapproved') ? '#FFFFE0' : id.closest('.widefat').css('backgroundColor');
id.animate( { 'backgroundColor':'#CCEEBB' }, 300 ) id.animate( { 'backgroundColor':'#CCEEBB' }, 300 )
.animate( { 'backgroundColor': bg }, 300, function() { .animate( { 'backgroundColor': bg }, 300, function() {

View File

@ -119,7 +119,7 @@ inlineEditPost = {
tax = 'post_tag'; tax = 'post_tag';
$('tr.inline-editor textarea[name="tags_input"]').suggest( 'admin-ajax.php?action=ajax-tag-search&tax='+tax, { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } ); $('tr.inline-editor textarea[name="tags_input"]').suggest( 'admin-ajax.php?action=ajax-tag-search&tax='+tax, { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } );
} }
$('html, body').animate( { scrollTop: 0 }, 'fast' ); $('html, body').animate( { scrollTop: 0 }, 'fast' );
}, },
edit : function(id) { edit : function(id) {

View File

@ -58,15 +58,15 @@ var tb_position;
$(window).resize(function(){ tb_position(); }); $(window).resize(function(){ tb_position(); });
// store caret position in IE // store caret position in IE
$(document).ready(function($){ $(document).ready(function($){
$('a.thickbox').click(function(){ $('a.thickbox').click(function(){
var ed; var ed;
if ( typeof tinyMCE != 'undefined' && tinymce.isIE && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) { if ( typeof tinyMCE != 'undefined' && tinymce.isIE && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) {
ed.focus(); ed.focus();
ed.windowManager.insertimagebookmark = ed.selection.getBookmark(); ed.windowManager.insertimagebookmark = ed.selection.getBookmark();
} }
}); });
}); });
})(jQuery); })(jQuery);

View File

@ -181,7 +181,7 @@ if ( ! is_multisite() || is_super_admin() || ! empty( $menu_perms['plugins'] ) )
$count = "<span class='update-plugins count-$plugin_update_count'><span class='plugin-count'>" . number_format_i18n($plugin_update_count) . "</span></span>"; $count = "<span class='update-plugins count-$plugin_update_count'><span class='plugin-count'>" . number_format_i18n($plugin_update_count) . "</span></span>";
$menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' ); $menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' );
$submenu['plugins.php'][5] = array( __('Installed Plugins'), 'activate_plugins', 'plugins.php' ); $submenu['plugins.php'][5] = array( __('Installed Plugins'), 'activate_plugins', 'plugins.php' );
if ( ! is_multisite() ) { if ( ! is_multisite() ) {

View File

@ -602,7 +602,7 @@ if ( user_can_richedit() ) {
<div class="postdivrich"> <div class="postdivrich">
<ul id="actions" class="actions"> <ul id="actions" class="actions">
<li><?php _e( 'Add:' ); ?></li> <li><?php _e( 'Add:' ); ?></li>
<li id="photo_button"> <li id="photo_button">
<?php if ( current_user_can('upload_files') ) { ?><a title="<?php _e('Insert an Image'); ?>" href="#"> <?php if ( current_user_can('upload_files') ) { ?><a title="<?php _e('Insert an Image'); ?>" href="#">
<img alt="<?php _e('Insert an Image'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-image.gif?ver=20100531' ) ); ?>"/></a> <img alt="<?php _e('Insert an Image'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-image.gif?ver=20100531' ) ); ?>"/></a>

View File

@ -100,7 +100,7 @@ function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
*/ */
function wp_admin_bar_dashboard_view_site_menu( $wp_admin_bar ) { function wp_admin_bar_dashboard_view_site_menu( $wp_admin_bar ) {
$user_id = get_current_user_id(); $user_id = get_current_user_id();
if ( 0 != $user_id ) { if ( 0 != $user_id ) {
if ( is_admin() ) if ( is_admin() )
$wp_admin_bar->add_menu( array( 'title' => __( 'Visit Site' ), 'href' => home_url() ) ); $wp_admin_bar->add_menu( array( 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
@ -259,7 +259,7 @@ function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) if ( ! is_multisite() && current_user_can( 'install_plugins' ) )
$actions[ 'plugin-install.php' ] = array( _x( 'Plugin', 'add new from admin bar' ), 'install_plugins', 'new-plugin' ); $actions[ 'plugin-install.php' ] = array( _x( 'Plugin', 'add new from admin bar' ), 'install_plugins', 'new-plugin' );
if ( empty( $actions ) ) if ( empty( $actions ) )
return; return;

View File

@ -370,15 +370,15 @@ function wp_list_authors($args = '') {
/** /**
* Does this site have more than one author * Does this site have more than one author
* *
* Checks to see if more than one author has published posts. * Checks to see if more than one author has published posts.
* *
* @since 3.2 * @since 3.2
* @return bool Whether or not we have more than one author * @return bool Whether or not we have more than one author
*/ */
function is_multi_author() { function is_multi_author() {
global $wpdb; global $wpdb;
if ( false === ( $is_multi_author = wp_cache_get('is_multi_author', 'posts') ) ) { if ( false === ( $is_multi_author = wp_cache_get('is_multi_author', 'posts') ) ) {
$rows = (array) $wpdb->get_col("SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 2"); $rows = (array) $wpdb->get_col("SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 2");
$is_multi_author = 1 < count( $rows ) ? 1 : 0; $is_multi_author = 1 < count( $rows ) ? 1 : 0;
@ -388,9 +388,9 @@ function is_multi_author() {
return (bool) $is_multi_author; return (bool) $is_multi_author;
} }
/** /**
* Helper function to clear the cache for number of authors. * Helper function to clear the cache for number of authors.
* *
* @private * @private
*/ */
function __clear_multi_author_cache() { function __clear_multi_author_cache() {

View File

@ -184,7 +184,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
} else { // Some query vars are set via $_GET. Unset those from $_GET that exist via the rewrite } else { // Some query vars are set via $_GET. Unset those from $_GET that exist via the rewrite
foreach ( $qv_remove as $_qv ) { foreach ( $qv_remove as $_qv ) {
if ( isset($rewrite_vars[$_qv]) ) if ( isset($rewrite_vars[$_qv]) )
$redirect['query'] = remove_query_arg($_qv, $redirect['query']); $redirect['query'] = remove_query_arg($_qv, $redirect['query']);
} }
} }

View File

@ -98,7 +98,7 @@ class WP_Http {
'filename' => null 'filename' => null
); );
// Pre-parse for the HEAD checks. // Pre-parse for the HEAD checks.
$args = wp_parse_args( $args ); $args = wp_parse_args( $args );
@ -193,7 +193,7 @@ class WP_Http {
/** /**
* Tests which transports are capable of supporting the request. * Tests which transports are capable of supporting the request.
* *
* @since 3.2.0 * @since 3.2.0
* @access private * @access private
* *

View File

@ -1045,7 +1045,7 @@ class wp_xmlrpc_server extends IXR_Server {
* - 'post_id' - Default is ''. The post where the comment is posted. Empty string shows all comments. * - 'post_id' - Default is ''. The post where the comment is posted. Empty string shows all comments.
* - 'number' - Default is 10. Total number of media items to retrieve. * - 'number' - Default is 10. Total number of media items to retrieve.
* - 'offset' - Default is 0. See {@link WP_Query::query()} for more. * - 'offset' - Default is 0. See {@link WP_Query::query()} for more.
* *
* @since 2.7.0 * @since 2.7.0
* *
* @param array $args Method parameters. * @param array $args Method parameters.
@ -1148,7 +1148,7 @@ class wp_xmlrpc_server extends IXR_Server {
/** /**
* Edit comment. * Edit comment.
* *
* Besides the common blog_id, username, and password arguments, it takes a * Besides the common blog_id, username, and password arguments, it takes a
* comment_id integer and a content_struct array as last argument. * comment_id integer and a content_struct array as last argument.
* *
* The allowed keys in the content_struct array are: * The allowed keys in the content_struct array are:
@ -1683,21 +1683,21 @@ class wp_xmlrpc_server extends IXR_Server {
do_action( 'xmlrpc_call', 'wp.getPostFormats' ); do_action( 'xmlrpc_call', 'wp.getPostFormats' );
$formats = get_post_format_strings(); $formats = get_post_format_strings();
# find out if they want a list of currently supports formats # find out if they want a list of currently supports formats
if ( isset( $args[3] ) && is_array( $args[3] ) ) { if ( isset( $args[3] ) && is_array( $args[3] ) ) {
if ( $args[3]['show-supported'] ) { if ( $args[3]['show-supported'] ) {
if ( current_theme_supports( 'post-formats' ) ) { if ( current_theme_supports( 'post-formats' ) ) {
$supported = get_theme_support( 'post-formats' ); $supported = get_theme_support( 'post-formats' );
$data['all'] = $formats; $data['all'] = $formats;
$data['supported'] = $supported[0]; $data['supported'] = $supported[0];
$formats = $data; $formats = $data;
} }
} }
} }
return $formats; return $formats;
} }
@ -2141,7 +2141,7 @@ class wp_xmlrpc_server extends IXR_Server {
/** /**
* Create a new post. * Create a new post.
* *
* The 'content_struct' argument must contain: * The 'content_struct' argument must contain:
* - title * - title
* - description * - description
@ -2150,7 +2150,7 @@ class wp_xmlrpc_server extends IXR_Server {
* - mt_keywords * - mt_keywords
* - mt_tb_ping_urls * - mt_tb_ping_urls
* - categories * - categories
* *
* Also, it can optionally contain: * Also, it can optionally contain:
* - wp_slug * - wp_slug
* - wp_password * - wp_password

View File

@ -2612,6 +2612,6 @@ function update_category_cache() {
*/ */
function wp_timezone_supported() { function wp_timezone_supported() {
_deprecated_function( __FUNCTION__, '3.2' ); _deprecated_function( __FUNCTION__, '3.2' );
return true; return true;
} }

View File

@ -1589,7 +1589,7 @@ function get_next_posts_link( $label = null, $max_page = 0 ) {
$paged = 1; $paged = 1;
$nextpage = intval($paged) + 1; $nextpage = intval($paged) + 1;
if ( null === $label ) if ( null === $label )
$label = __( 'Next Page &raquo;' ); $label = __( 'Next Page &raquo;' );

View File

@ -402,7 +402,7 @@ class WP_Meta_Query {
* @since 3.2 * @since 3.2
* @access public * @access public
* @var string * @var string
*/ */
public $relation; public $relation;
/** /**

View File

@ -1131,7 +1131,7 @@ function get_term_to_edit( $id, $taxonomy ) {
* of term Y only if term X is the father of term Y, not its grandfather or great-grandfather, etc. * of term Y only if term X is the father of term Y, not its grandfather or great-grandfather, etc.
* *
* The 'cache_domain' argument enables a unique cache key to be produced when this query is stored * The 'cache_domain' argument enables a unique cache key to be produced when this query is stored
* in object cache. For instance, if you are using one of this function's filters to modify the * in object cache. For instance, if you are using one of this function's filters to modify the
* query (such as 'terms_clauses'), setting 'cache_domain' to a unique value will not overwrite * query (such as 'terms_clauses'), setting 'cache_domain' to a unique value will not overwrite
* the cache for similar queries. Default value is 'core'. * the cache for similar queries. Default value is 'core'.
* *