From 62afab8db332e1b20d1d504d0fd1d6e5c9393fe5 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 24 Oct 2011 19:13:23 +0000 Subject: [PATCH] Pinking shears git-svn-id: http://svn.automattic.com/wordpress/trunk@19054 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/ie-rtl.dev.css | 2 +- wp-admin/edit-form-advanced.php | 8 +++---- wp-admin/edit-tags.php | 4 ++-- .../includes/class-wp-posts-list-table.php | 4 ++-- wp-admin/includes/class-wp-upgrader.php | 2 +- wp-admin/includes/deprecated.php | 2 +- wp-admin/includes/file.php | 2 +- wp-admin/includes/media.php | 4 ++-- wp-admin/includes/post.php | 2 +- wp-admin/includes/screen.php | 22 +++++++++---------- wp-admin/js/common.dev.js | 2 +- wp-admin/js/editor.dev.js | 12 +++++----- wp-admin/network.php | 2 +- wp-admin/press-this.php | 8 +++---- wp-admin/update-core.php | 8 +++---- wp-includes/class-http.php | 6 ++--- wp-includes/class-wp-editor.php | 2 +- wp-includes/functions.php | 4 ++-- wp-includes/functions.wp-scripts.php | 2 +- wp-includes/functions.wp-styles.php | 2 +- wp-includes/link-template.php | 4 ++-- wp-includes/meta.php | 2 +- wp-includes/post.php | 4 ++-- wp-includes/taxonomy.php | 4 ++-- wp-includes/update.php | 2 +- wp-includes/widgets.php | 2 +- 26 files changed, 59 insertions(+), 59 deletions(-) diff --git a/wp-admin/css/ie-rtl.dev.css b/wp-admin/css/ie-rtl.dev.css index b71ac5c61..b58dbc904 100644 --- a/wp-admin/css/ie-rtl.dev.css +++ b/wp-admin/css/ie-rtl.dev.css @@ -126,7 +126,7 @@ form#widgets-filter { /* fix widget page */ position: static; } -/* nav menus +/* nav menus .menu-max-depth-0 #menu-management { width: 460px; } .menu-max-depth-1 #menu-management { width: 490px; } .menu-max-depth-2 #menu-management { width: 520px; } diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 6ebfe2645..dc9c54f15 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -212,23 +212,23 @@ if ( 'post' == $post_type ) { } elseif ( 'page' == $post_type ) { $about_pages = '

' . __('Pages are similar to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the “Parent” of the other, creating a group of Pages.') . '

' . '

' . __('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the new in 3.2 distraction-free writing space, available in both the Visual and HTML modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box:') . '

'; - + $current_screen->add_help_tab( array( 'id' => 'about-pages', 'title' => __('About Pages'), 'content' => $about_pages, ) ); - + $page_attributes = '

' . __('Parent - You can arrange your pages in hierarchies. For example, you could have an “About” page that has “Life Story” and “My Dog” pages under it. There are no limits to how many levels you can nest pages.') . '

' . '

' . __('Template - Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you’ll see them in this dropdown menu.') . '

' . '

' . __('Order - Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.') . '

'; - + $current_screen->add_help_tab( array( 'id' => 'page-attributes', 'title' => __('Page Attributes'), 'content' => $page_attributes, ) ); - + $current_screen->add_help_sidebar( '

' . __('For more information:') . '

' . '

' . __('Documentation on Adding New Pages') . '

' . diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 00ad49dec..7cf21c95d 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -143,8 +143,8 @@ case 'editedtag': if ( !current_user_can( $tax->cap->edit_terms ) ) wp_die( __( 'Cheatin’ uh?' ) ); - - $tag = get_term( $tag_ID, $taxonomy ); + + $tag = get_term( $tag_ID, $taxonomy ); if ( ! $tag ) wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php index 07fd34def..639c1c0f2 100644 --- a/wp-admin/includes/class-wp-posts-list-table.php +++ b/wp-admin/includes/class-wp-posts-list-table.php @@ -864,7 +864,7 @@ class WP_Posts_List_Table extends WP_List_Table {

-id ] = $help; + self::$_old_compat_help[ $screen->id ] = $help; } /** diff --git a/wp-admin/js/common.dev.js b/wp-admin/js/common.dev.js index b067cf311..c81ced4a7 100644 --- a/wp-admin/js/common.dev.js +++ b/wp-admin/js/common.dev.js @@ -142,7 +142,7 @@ screenMeta = { height; columns.height('auto'); - + height = Math.max.apply( null, $.map( columns, function( el ) { return $(el).height(); }) ); columns.height( height ); diff --git a/wp-admin/js/editor.dev.js b/wp-admin/js/editor.dev.js index 34ce30b68..362ea604f 100644 --- a/wp-admin/js/editor.dev.js +++ b/wp-admin/js/editor.dev.js @@ -1,10 +1,10 @@ var switchEditors = { - + go: function(a) { var t = this, aid = a.id, l = aid.length, id = aid.substr(0, l - 5), mode = aid.substr(l - 4), ed = tinyMCE.get(id), wrap_id = 'wp-'+id+'-wrap', dom = tinymce.DOM, txtarea_el = dom.get(id); - + if ( 'tmce' == mode ) { if ( ed && ! ed.isHidden() ) return false; @@ -14,7 +14,7 @@ var switchEditors = { if ( tinyMCEPreInit.mceInit[id] && tinyMCEPreInit.mceInit[id].wpautop ) txtarea_el.value = t.wpautop( txtarea_el.value ); - + if ( ed ) { ed.show(); } else { @@ -25,12 +25,12 @@ var switchEditors = { dom.removeClass(wrap_id, 'html-active'); dom.addClass(wrap_id, 'tmce-active'); setUserSetting('editor', 'tinymce'); - + } else if ( 'html' == mode ) { if ( ed && ed.isHidden() ) return false; - + if ( ed ) { txtarea_el.style.height = ed.getContentAreaContainer().offsetHeight + 20 + 'px'; ed.hide(); @@ -42,7 +42,7 @@ var switchEditors = { } return false; }, - + _wp_Nop : function(content) { var blocklist1, blocklist2; diff --git a/wp-admin/network.php b/wp-admin/network.php index 3cbbee42d..1237097d9 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -523,7 +523,7 @@ if ( $_POST ) { // create network tables install_network(); $hostname = get_clean_basedomain(); - $subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false; + $subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false; if ( ! network_domain_check() ) { $result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), stripslashes( $_POST['sitename'] ), $base, $subdomain_install ); if ( is_wp_error( $result ) ) { diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php index 2960e849a..baae4a21b 100644 --- a/wp-admin/press-this.php +++ b/wp-admin/press-this.php @@ -578,10 +578,10 @@ var photostorage = false; if ( $url ) { $content .= '

'; - + if ( $selection ) $content .= __('via '); - + $content .= sprintf( "%s.

", esc_url( $url ), esc_html( $title ) ); } @@ -602,7 +602,7 @@ var photostorage = false; } wp_editor( $content, 'content', $editor_settings ); - + ?> @@ -619,7 +619,7 @@ var photostorage = false; - diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 5830eb641..4f5efcc29 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -12,7 +12,7 @@ require_once('./admin.php'); wp_enqueue_style( 'plugin-install' ); wp_enqueue_script( 'plugin-install' ); add_thickbox(); - + if ( is_multisite() && ! is_network_admin() ) { wp_redirect( network_admin_url( 'update-core.php' ) ); exit(); @@ -250,11 +250,11 @@ function list_plugin_updates() { } else { $upgrade_notice = ''; } - + $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '&TB_iframe=true&width=640&height=662'); - $details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version); + $details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version); $details = sprintf('%3$s.', esc_url($details_url), esc_attr($plugin_data->Name), $details_text); - + echo " diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php index e2bfac19c..cd8bbef98 100644 --- a/wp-includes/class-http.php +++ b/wp-includes/class-http.php @@ -1626,12 +1626,12 @@ class WP_Http_Encoding { * Decompression of deflated string while staying compatible with the majority of servers. * * Certain Servers will return deflated data with headers which PHP's gziniflate() - * function cannot handle out of the box. The following function has been created from - * various snippets on the gzinflate() PHP documentation. + * function cannot handle out of the box. The following function has been created from + * various snippets on the gzinflate() PHP documentation. * * Warning: Magic numbers within. Due to the potential different formats that the compressed * data may be returned in, some "magic offsets" are needed to ensure proper decompression - * takes place. For a simple progmatic way to determine the magic offset in use, see: + * takes place. For a simple progmatic way to determine the magic offset in use, see: * http://core.trac.wordpress.org/ticket/18273 * * @since 2.8.1 diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php index bfbe39f59..a340d281d 100644 --- a/wp-includes/class-wp-editor.php +++ b/wp-includes/class-wp-editor.php @@ -375,7 +375,7 @@ class WP_Editor { elseif ( ($key = array_search('fullscreen', $mce_buttons_2)) !== false ) $mce_buttons_2[$key] = 'wp_fullscreen'; elseif ( ($key = array_search('fullscreen', $mce_buttons_3)) !== false ) - $mce_buttons_3[$key] = 'wp_fullscreen'; + $mce_buttons_3[$key] = 'wp_fullscreen'; elseif ( ($key = array_search('fullscreen', $mce_buttons_4)) !== false ) $mce_buttons_4[$key] = 'wp_fullscreen'; } diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 7fade59eb..f670f0eaa 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2826,10 +2826,10 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) { nocache_headers(); header( 'Content-Type: text/html; charset=utf-8' ); } - + if ( empty($title) ) $title = $have_gettext ? __('WordPress › Error') : 'WordPress › Error'; - + $text_direction = 'ltr'; if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] ) $text_direction = 'rtl'; diff --git a/wp-includes/functions.wp-scripts.php b/wp-includes/functions.wp-scripts.php index 650042f45..53794ac6c 100644 --- a/wp-includes/functions.wp-scripts.php +++ b/wp-includes/functions.wp-scripts.php @@ -77,7 +77,7 @@ function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_f * The $data array is JSON encoded. If called more than once for the same $handle with the same $name, * the object would contain all values. In that case if two or more keys are the same, * the last value overwrites the previous. The function is named "localize_script" because of historical reasons. - * + * * @since r16 * @see WP_Scripts::add_script_data() */ diff --git a/wp-includes/functions.wp-styles.php b/wp-includes/functions.wp-styles.php index 50c736773..8a887e8e0 100644 --- a/wp-includes/functions.wp-styles.php +++ b/wp-includes/functions.wp-styles.php @@ -44,7 +44,7 @@ function wp_print_styles( $handles = false ) { * Accepts a string $data containing the CSS. If two or more CSS code blocks are * added to the same stylesheet $handle, they will be printed in the order * they were added, i.e. the latter added styles can redeclare the previous. - * + * * @since 3.3 * @see WP_Scripts::add_inline_style() */ diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 4f64a48a1..7c5f51195 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -1128,7 +1128,7 @@ function get_adjacent_post( $in_same_cat = false, $excluded_categories = '', $pr } $excluded_categories = array_map( 'intval', $excluded_categories ); - + if ( ! empty( $cat_array ) ) { $excluded_categories = array_diff($excluded_categories, $cat_array); $posts_in_ex_cats_sql = ''; @@ -1276,7 +1276,7 @@ function get_boundary_post( $in_same_cat = false, $excluded_categories = '', $st $cat_array = array(); if( ! is_array( $excluded_categories ) ) $excluded_categories = explode( ',', $excluded_categories ); - + if ( $in_same_cat || ! empty( $excluded_categories ) ) { if ( $in_same_cat ) $cat_array = wp_get_object_terms( $post->ID, 'category', array( 'fields' => 'ids' ) ); diff --git a/wp-includes/meta.php b/wp-includes/meta.php index f4e23a6c3..a318bbe21 100644 --- a/wp-includes/meta.php +++ b/wp-includes/meta.php @@ -307,7 +307,7 @@ function get_metadata($meta_type, $object_id, $meta_key = '', $single = false) { * * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) * @param int $object_id ID of the object metadata is for - * @param string $meta_key Metadata key. + * @param string $meta_key Metadata key. * @return boolean true of the key is set, false if not. */ function metadata_exists( $meta_type, $object_id, $meta_key ) { diff --git a/wp-includes/post.php b/wp-includes/post.php index 38c3558ea..bc62e8f75 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -1040,7 +1040,7 @@ function register_post_type($post_type, $args = array()) { } do_action( 'registered_post_type', $post_type, $args ); - + return $args; } @@ -5308,7 +5308,7 @@ add_filter( 'wp_get_object_terms', '_post_format_wp_get_object_terms' ); /** * Update the custom taxonomies' term counts when a post's status is changed. For example, default posts term counts (for custom taxonomies) don't include private / draft posts. - * + * * @access private * @param string $new_status * @param string $old_status diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 68bc9683d..2853a279c 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -2854,7 +2854,7 @@ function _update_post_term_count( $terms, $taxonomy ) { global $wpdb; $object_types = (array) $taxonomy->object_type; - + foreach ( $object_types as &$object_type ) list( $object_type ) = explode( ':', $object_type ); @@ -2878,7 +2878,7 @@ function _update_post_term_count( $terms, $taxonomy ) { if ( $object_types ) $count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) ); - + do_action( 'edit_term_taxonomy', $term, $taxonomy ); $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) ); do_action( 'edited_term_taxonomy', $term, $taxonomy ); diff --git a/wp-includes/update.php b/wp-includes/update.php index d8de2bf2d..f832dc285 100644 --- a/wp-includes/update.php +++ b/wp-includes/update.php @@ -330,7 +330,7 @@ function wp_get_update_data() { $update_title[] = sprintf(_n('%d Theme Update', '%d Theme Updates', $counts['themes']), $counts['themes']); $update_title = ! empty( $update_title ) ? esc_attr( implode( ', ', $update_title ) ) : ''; - + return array( 'counts' => $counts, 'title' => $update_title ); } diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php index ff53c1197..d546f590e 100644 --- a/wp-includes/widgets.php +++ b/wp-includes/widgets.php @@ -1150,7 +1150,7 @@ function _get_widget_id_base($id) { * * @access private * @since 3.3 - */ + */ function _wp_sidebars_changed() { global $sidebars_widgets;