From 616c35e71cfca0be11c51ce0030092d75f43e709 Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 5 Jan 2012 20:10:39 +0000 Subject: [PATCH] One newline is enough. git-svn-id: http://svn.automattic.com/wordpress/trunk@19684 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- readme.html | 1 - wp-admin/admin-ajax.php | 1 - wp-admin/admin.php | 1 - wp-admin/css/colors-classic.dev.css | 2 -- wp-admin/css/colors-fresh.dev.css | 1 - wp-admin/css/farbtastic.css | 3 --- wp-admin/css/ie.dev.css | 1 - wp-admin/css/install.dev.css | 1 - wp-admin/css/media.dev.css | 1 - wp-admin/css/wp-admin-rtl.dev.css | 21 ++++++------------- wp-admin/css/wp-admin.dev.css | 5 ----- wp-admin/custom-header.php | 2 -- wp-admin/import.php | 1 - .../includes/class-wp-ms-users-list-table.php | 1 - wp-admin/includes/class-wp-upgrader.php | 1 - wp-admin/includes/dashboard.php | 1 - wp-admin/includes/deprecated.php | 1 - wp-admin/includes/image-edit.php | 1 - wp-admin/includes/meta-boxes.php | 18 ---------------- wp-admin/includes/misc.php | 1 - wp-admin/includes/nav-menu.php | 4 ---- wp-admin/includes/plugin.php | 1 - wp-admin/includes/template.php | 2 -- wp-admin/includes/theme.php | 1 - wp-admin/index.php | 1 - wp-admin/js/dashboard.dev.js | 1 - wp-admin/js/edit-comments.dev.js | 2 -- wp-admin/js/wp-fullscreen.dev.js | 1 - wp-admin/load-scripts.php | 1 - wp-admin/load-styles.php | 1 - wp-admin/media.php | 1 - wp-admin/nav-menus.php | 4 ---- wp-admin/network/menu.php | 1 - wp-admin/network/themes.php | 1 - wp-admin/network/user-new.php | 1 - wp-admin/options-permalink.php | 1 - wp-admin/options-writing.php | 2 -- wp-admin/options.php | 1 - wp-admin/plugins.php | 1 - wp-admin/update-core.php | 2 -- wp-admin/user-edit.php | 2 -- wp-includes/category-template.php | 5 +---- wp-includes/category.php | 3 --- wp-includes/class-http.php | 2 -- wp-includes/class-wp-xmlrpc-server.php | 2 -- wp-includes/comment.php | 1 - wp-includes/css/admin-bar.dev.css | 1 - wp-includes/css/editor-buttons.dev.css | 12 ----------- wp-includes/deprecated.php | 2 -- wp-includes/functions.php | 1 - wp-includes/general-template.php | 1 - wp-includes/js/wp-pointer.dev.js | 1 - wp-includes/link-template.php | 1 - wp-includes/plugin.php | 2 -- wp-includes/post-template.php | 1 - wp-includes/post.php | 3 --- wp-includes/query.php | 2 -- wp-includes/rss.php | 3 --- wp-includes/taxonomy.php | 10 --------- wp-includes/theme-compat/comments.php | 1 - wp-includes/theme-compat/header.php | 1 - wp-includes/user.php | 3 --- wp-includes/widgets.php | 1 - wp-includes/wp-diff.php | 3 --- wp-settings.php | 1 - 65 files changed, 7 insertions(+), 153 deletions(-) diff --git a/readme.html b/readme.html index e1d327760c..49a8cc0c9b 100644 --- a/readme.html +++ b/readme.html @@ -104,6 +104,5 @@

License

WordPress is free software, and is released under the terms of the GPL version 2 or (at your option) any later version. See license.txt.

- diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index 6639997106..1bc8440296 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -668,7 +668,6 @@ case 'replyto-comment' : $position = ( isset($_POST['position']) && (int) $_POST['position'] ) ? (int) $_POST['position'] : '-1'; - // automatically approve parent comment if ( !empty($_POST['approve_parent']) ) { $parent = get_comment( $comment_parent ); diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 46e45e34d8..4feeedfaa1 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -153,7 +153,6 @@ if ( isset($plugin_page) ) { if ( validate_file($plugin_page) ) wp_die(__('Invalid plugin page')); - if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) ) wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page))); diff --git a/wp-admin/css/colors-classic.dev.css b/wp-admin/css/colors-classic.dev.css index 3c71473c96..3f946930fd 100644 --- a/wp-admin/css/colors-classic.dev.css +++ b/wp-admin/css/colors-classic.dev.css @@ -1002,7 +1002,6 @@ table.widefat .spam a:hover, border-color: #5589AA !important; } - .wp-editor-wrap .wp_themeSkin table.mceSplitButton td { background-color: #cfdfe9; /* Fallback */ background-image: -ms-linear-gradient(bottom, #cfdfe9, #fff); /* IE10 */ @@ -1604,7 +1603,6 @@ table.widefat .spam a:hover, } /* end screen icons */ - /* Diff */ table.diff .diff-deletedline { background-color: #fdd; diff --git a/wp-admin/css/colors-fresh.dev.css b/wp-admin/css/colors-fresh.dev.css index 4543e55b8b..682a6f8199 100644 --- a/wp-admin/css/colors-fresh.dev.css +++ b/wp-admin/css/colors-fresh.dev.css @@ -1294,7 +1294,6 @@ table.widefat .spam a:hover, } /* end screen icons */ - /* Diff */ table.diff .diff-deletedline { background-color: #fdd; diff --git a/wp-admin/css/farbtastic.css b/wp-admin/css/farbtastic.css index 1022b71a1f..ef1129c0de 100644 --- a/wp-admin/css/farbtastic.css +++ b/wp-admin/css/farbtastic.css @@ -40,7 +40,6 @@ background: url(../images/marker.png) no-repeat; } - /* farbtastic-rtl */ .rtl .farbtastic .color, .rtl .farbtastic .overlay { @@ -51,5 +50,3 @@ .rtl .farbtastic .marker { margin: -8px -8px 0 0; } - - diff --git a/wp-admin/css/ie.dev.css b/wp-admin/css/ie.dev.css index 91069e7854..418ffe1cdb 100644 --- a/wp-admin/css/ie.dev.css +++ b/wp-admin/css/ie.dev.css @@ -422,7 +422,6 @@ table.ie-fixed { margin-left: 0; } - /* IE6 leftovers */ * html .row-actions { visibility: visible; diff --git a/wp-admin/css/install.dev.css b/wp-admin/css/install.dev.css index 04ff488b06..cfcd09cf0d 100644 --- a/wp-admin/css/install.dev.css +++ b/wp-admin/css/install.dev.css @@ -228,7 +228,6 @@ textarea { background-color: #ffffe0; } - /* install-rtl */ body.rtl { font-family: Tahoma, arial; diff --git a/wp-admin/css/media.dev.css b/wp-admin/css/media.dev.css index 38361bb4c0..24b163eba9 100644 --- a/wp-admin/css/media.dev.css +++ b/wp-admin/css/media.dev.css @@ -51,7 +51,6 @@ th { /* specific to the image upload form */ - .image-align-none-label { background: url(../images/align-none.png) no-repeat center left; } diff --git a/wp-admin/css/wp-admin-rtl.dev.css b/wp-admin/css/wp-admin-rtl.dev.css index c5a0b9257f..6ce94534f7 100644 --- a/wp-admin/css/wp-admin-rtl.dev.css +++ b/wp-admin/css/wp-admin-rtl.dev.css @@ -59,7 +59,6 @@ ol { font-family: Tahoma, Arial, sans-serif; } - .quicktags, .search { font: 12px Tahoma, Arial, sans-serif; } @@ -866,7 +865,6 @@ th.sorted a span { float: left; } - #post-body ul.category-tabs, #post-body ul.add-menu-item-tabs { float: right; @@ -875,7 +873,6 @@ th.sorted a span { margin: 0 5px 0 -120px; } - #post-body ul.category-tabs li.tabs, #post-body ul.add-menu-item-tabs li.tabs { -webkit-border-top-left-radius: 0; @@ -972,7 +969,6 @@ table.diff td, table.diff th { margin-right: 120px; } - #post-body ul.category-tabs, #post-body ul.add-menu-item-tabs { float: right; @@ -1107,7 +1103,6 @@ span.description, padding: 5px 8px 0 0; } - .find-box-search label { padding-right: 0; padding-left: 6px; @@ -1118,7 +1113,6 @@ span.description, left: 1px; } - form.upgrade .hint { font-style: normal; } @@ -1704,11 +1698,11 @@ ol.ol-decimal { margin-left: 15px; } - .wrap h2, .subtitle { font-family: Tahoma, Arial, sans-serif; } + .wrap h2 { padding-right: 0; padding-left: 15px; @@ -1729,7 +1723,6 @@ ol.ol-decimal { padding-left: 0; } - /* dashboard */ #dashboard-widgets-wrap .has-sidebar { margin-right: 0; @@ -1927,7 +1920,6 @@ body.login { float: left; } - /* nav-menu */ #nav-menus-frame { margin-right: 300px; @@ -2047,7 +2039,6 @@ body.login { margin-right:0; } - /* WARNING: The factor of 30px is hardcoded into the nav-menus javascript. */ .menu-item-depth-0 { margin-right: 0px; margin-left:0;} .menu-item-depth-1 { margin-right: 30px; margin-left:0;} @@ -2110,10 +2101,11 @@ body.login { font-style: normal; font-weight: bold; } - .link-to-original a { - padding-right: 4px; - padding-left:0; - } + +.link-to-original a { + padding-right: 4px; + padding-left:0; +} .menu-item-settings .description-thin, .menu-item-settings .description-wide { @@ -2144,7 +2136,6 @@ body.login { float: right; } - /* plugin-install */ div.star { left: auto; diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css index 910998addc..bfa08ed83b 100644 --- a/wp-admin/css/wp-admin.dev.css +++ b/wp-admin/css/wp-admin.dev.css @@ -6052,7 +6052,6 @@ a.rsswidget { text-align: center; } - /* ms */ /* Dashboard: MS Specific Data */ #dashboard_right_now p.musub { @@ -6093,7 +6092,6 @@ a.rsswidget { background: #fecac2; } - /* nav-menu */ #nav-menus-frame { @@ -6730,7 +6728,6 @@ body.menu-max-depth-11 { min-width: 1280px !important; } display: block; } - /* plugin-install */ /* NOTE: the following CSS rules(.star*) are taken more or less straight from the bbPress rating plugin. */ div.star-holder { @@ -7298,7 +7295,6 @@ h3 span { line-height: 180%; } - /* theme-install */ .theme-listing .theme-item { display: inline-block; @@ -7407,7 +7403,6 @@ overflow: auto; margin-bottom: 10px; } - /* widgets */ /* 2 column liquid layout */ diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php index fc6a5f00a3..84d103e0f4 100644 --- a/wp-admin/custom-header.php +++ b/wp-admin/custom-header.php @@ -42,7 +42,6 @@ class Custom_Image_Header { */ var $default_headers = array(); - /** * Holds custom headers uploaded by the user * @@ -486,7 +485,6 @@ class Custom_Image_Header { -
diff --git a/wp-admin/import.php b/wp-admin/import.php index 6906636516..9b7c02e1ab 100644 --- a/wp-admin/import.php +++ b/wp-admin/import.php @@ -23,7 +23,6 @@ get_current_screen()->add_help_tab( array( '

' . __('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.') . '

', ) ); - get_current_screen()->set_help_sidebar( '

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

' . '

' . __('Documentation on Import') . '

' . diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php index a6b5f8a3f3..ec028cee11 100644 --- a/wp-admin/includes/class-wp-ms-users-list-table.php +++ b/wp-admin/includes/class-wp-ms-users-list-table.php @@ -162,7 +162,6 @@ class WP_MS_Users_List_Table extends WP_List_Table { $attributes = "$class$style"; - switch ( $column_name ) { case 'cb': ?> 		diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index c5fa3551fd..4e248ce5d9 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -1362,7 +1362,6 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin { else $install_actions['plugins_page'] = '' . __('Return to Plugins page') . ''; - if ( ! $this->result || is_wp_error($this->result) ) { unset( $install_actions['activate_plugin'] ); unset( $install_actions['network_activate'] ); diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 9a568308e3..cdbc5998a8 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -327,7 +327,6 @@ function wp_dashboard_right_now() { do_action('right_now_content_table_end'); echo "\n\t
\n\t"; - echo "\n\t".'
'; echo "\n\t".'

' . __('Discussion') . '

'."\n\t".''; echo "\n\t".''; diff --git a/wp-admin/includes/deprecated.php b/wp-admin/includes/deprecated.php index c1fbc22a9d..32498c7e3f 100644 --- a/wp-admin/includes/deprecated.php +++ b/wp-admin/includes/deprecated.php @@ -197,7 +197,6 @@ function use_codepress() { return; } - /** * @deprecated 3.1.0 * diff --git a/wp-admin/includes/image-edit.php b/wp-admin/includes/image-edit.php index ceccab3c2c..c20b8f74fc 100644 --- a/wp-admin/includes/image-edit.php +++ b/wp-admin/includes/image-edit.php @@ -288,7 +288,6 @@ function _rotate_image_resource($img, $angle) { return $img; } - function _flip_image_resource($img, $horz, $vert) { $w = imagesx($img); $h = imagesy($img); diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php index 22384db0e7..1a438732b1 100644 --- a/wp-admin/includes/meta-boxes.php +++ b/wp-admin/includes/meta-boxes.php @@ -135,8 +135,6 @@ echo esc_html( $visibility_trans ); ?>ID)); ?> /> - - />
ID ) ); ?> tabindex="4" />
@@ -261,7 +259,6 @@ function post_format_meta_box( $post, $box ) { -
@@ -767,7 +765,6 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
-

' . __('The menu item has been successfully deleted.') . '

'; break; @@ -615,5 +612,4 @@ require_once( './admin-header.php' ); - diff --git a/wp-admin/network/menu.php b/wp-admin/network/menu.php index 0e94db960f..ed611b7f65 100644 --- a/wp-admin/network/menu.php +++ b/wp-admin/network/menu.php @@ -41,7 +41,6 @@ $submenu['plugins.php'][5] = array( __('Installed Plugins'), 'manage_network_pl $submenu['plugins.php'][10] = array( _x('Add New', 'plugin editor'), 'install_plugins', 'plugin-install.php' ); $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' ); - $menu[25] = array(__('Settings'), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'div'); if ( defined( 'MULTISITE' ) && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) { $submenu['settings.php'][5] = array( __('Network Settings'), 'manage_network_options', 'settings.php' ); diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php index 611c0957f4..48ddc6878f 100644 --- a/wp-admin/network/themes.php +++ b/wp-admin/network/themes.php @@ -95,7 +95,6 @@ if ( $action ) { screen_icon(); echo '

' . esc_html( $title ) . '

'; - $url = self_admin_url('update.php?action=update-selected-themes&themes=' . urlencode( join(',', $themes) )); $url = wp_nonce_url($url, 'bulk-update-themes'); diff --git a/wp-admin/network/user-new.php b/wp-admin/network/user-new.php index 03dadce8c3..88cc6cbc7f 100644 --- a/wp-admin/network/user-new.php +++ b/wp-admin/network/user-new.php @@ -16,7 +16,6 @@ if ( ! is_multisite() ) if ( ! current_user_can('create_users') ) wp_die(__('You do not have sufficient permissions to add users to this network.')); - get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index 95bc96ed10..f8ef7d962f 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -142,7 +142,6 @@ else $wp_rewrite->flush_rules(); - if (isset($_POST['submit'])) : ?>

add_help_tab( array( 'content' => '

' . __('Press This is a bookmarklet that makes it easy to blog about something you come across on the web. You can use it to just grab a link, or to post an excerpt. Press This will even allow you to choose from images included on the page and use them in your post. Just drag the Press This link on this screen to your bookmarks bar in your browser, and you’ll be on your way to easier content creation. Clicking on it while on another website opens a popup window with all these options.') . '

', ) ); - if ( is_multisite() ) { $post_email_help = '

' . __('Due to security issues, you cannot use Post By Email on Multisite Installs.') . '

'; } else { @@ -120,7 +119,6 @@ wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_link_category
-

diff --git a/wp-admin/options.php b/wp-admin/options.php index c659f6909b..adcdb64412 100644 --- a/wp-admin/options.php +++ b/wp-admin/options.php @@ -221,7 +221,6 @@ endforeach;
- diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 438d71f846..f1b6164fa5 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -117,7 +117,6 @@ if ( $action ) { screen_icon(); echo '

' . esc_html( $title ) . '

'; - $url = self_admin_url('update.php?action=update-selected&plugins=' . urlencode( join(',', $plugins) )); $url = wp_nonce_url($url, 'bulk-update-plugins'); diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 134d8ea277..bc080f2f4f 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -352,7 +352,6 @@ function do_core_upgrade( $reinstall = false ) { if ( !$update ) return; - if ( ! WP_Filesystem($credentials, ABSPATH) ) { request_filesystem_credentials($url, '', true, ABSPATH); //Failed to connect, Error and request again return; @@ -447,7 +446,6 @@ get_current_screen()->add_help_tab( array( '

' . __('To update themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '

' ) ); - get_current_screen()->set_help_sidebar( '

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

' . '

' . __('Documentation on Updating WordPress') . '

' . diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index 5f3d07e0ff..953c148833 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -36,7 +36,6 @@ if ( current_user_can('edit_users') && !is_user_admin() ) else $parent_file = 'profile.php'; - $profile_help = '

' . __('Your profile contains information about you (your “account”) as well as some personal options related to using WordPress.') . '

' . '

' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '

' . '

' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '

' . @@ -75,7 +74,6 @@ function use_ssl_preference($user) { ID && ! apply_filters( 'enable_edit_any_user_configuration', true ) ) wp_die( __( 'You do not have permission to edit this user.' ) ); diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index 7144bd578b..4a70a2422a 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -212,7 +212,6 @@ function get_the_category_list( $separator = '', $parents='', $post_id = false ) return apply_filters( 'the_category', $thelist, $separator, $parents ); } - /** * Check if the current post in within any of the given categories. * @@ -369,10 +368,10 @@ function wp_dropdown_categories( $args = '' ) { $output .= walk_category_dropdown_tree( $categories, $depth, $r ); } + if ( ! $r['hide_if_empty'] || ! empty($categories) ) $output .= "\n"; - $output = apply_filters( 'wp_dropdown_cats', $output ); if ( $echo ) @@ -581,7 +580,6 @@ function default_topic_count_scale( $count ) { return round(log10($count + 1) * 100); } - /** * Generates a tag cloud (heatmap) from provided data. * @@ -1153,7 +1151,6 @@ function the_terms( $id = 0, $taxonomy, $before = '', $sep = ', ', $after = '' ) echo apply_filters('the_terms', $term_list, $taxonomy, $before, $sep, $after); } - /** * Check if the current post has any of given category. * diff --git a/wp-includes/category.php b/wp-includes/category.php index 96eefa8805..5bbf1dd8d0 100644 --- a/wp-includes/category.php +++ b/wp-includes/category.php @@ -160,7 +160,6 @@ function get_category_by_slug( $slug ) { return $category; } - /** * Retrieve the ID of a category from its name. * @@ -176,7 +175,6 @@ function get_cat_ID( $cat_name='General' ) { return 0; } - /** * Retrieve the name of a category from its ID. * @@ -193,7 +191,6 @@ function get_cat_name( $cat_id ) { return $category->name; } - /** * Check if a category is an ancestor of another category. * diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php index abbaf5a823..50b3a909b9 100644 --- a/wp-includes/class-http.php +++ b/wp-includes/class-http.php @@ -98,7 +98,6 @@ class WP_Http { 'filename' => null ); - // Pre-parse for the HEAD checks. $args = wp_parse_args( $args ); @@ -1028,7 +1027,6 @@ class WP_Http_Curl { elseif ( ! $is_local ) $ssl_verify = apply_filters('https_ssl_verify', $ssl_verify); - // CURLOPT_TIMEOUT and CURLOPT_CONNECTTIMEOUT expect integers. Have to use ceil since // a value of 0 will allow an unlimited timeout. $timeout = (int) ceil( $r['timeout'] ); diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php index 6160908ddc..943306f223 100644 --- a/wp-includes/class-wp-xmlrpc-server.php +++ b/wp-includes/class-wp-xmlrpc-server.php @@ -408,7 +408,6 @@ class wp_xmlrpc_server extends IXR_Server { if ( !$user = $this->login($username, $password) ) return $this->error; - do_action( 'xmlrpc_call', 'wp.getUsersBlogs' ); $blogs = (array) get_blogs_of_user( $user->ID ); @@ -3469,7 +3468,6 @@ class wp_xmlrpc_server extends IXR_Server { } $post_ID = (int) $post_ID; - logIO("O","(PB) URL='$pagelinkedto' ID='$post_ID' Found='$way'"); $post = get_post($post_ID); diff --git a/wp-includes/comment.php b/wp-includes/comment.php index e9171130a6..a2dcf78190 100644 --- a/wp-includes/comment.php +++ b/wp-includes/comment.php @@ -394,7 +394,6 @@ function get_comment_statuses( ) { return $status; } - /** * The date the last comment was modified. * diff --git a/wp-includes/css/admin-bar.dev.css b/wp-includes/css/admin-bar.dev.css index b257056e02..e1d154d241 100644 --- a/wp-includes/css/admin-bar.dev.css +++ b/wp-includes/css/admin-bar.dev.css @@ -48,7 +48,6 @@ background-image: linear-gradient(bottom, #373737, #464646 5px); /* proposed W3C Markup */ } - #wpadminbar .ab-sub-wrapper, #wpadminbar ul, #wpadminbar ul li { diff --git a/wp-includes/css/editor-buttons.dev.css b/wp-includes/css/editor-buttons.dev.css index a3e56e1ad2..55a9130bfe 100644 --- a/wp-includes/css/editor-buttons.dev.css +++ b/wp-includes/css/editor-buttons.dev.css @@ -189,7 +189,6 @@ margin: 0 0 0 1px; } - .wp_themeSkin a.mceButton:active, .wp_themeSkin a.mceButtonActive, .wp_themeSkin a.mceButtonActive:hover, @@ -556,7 +555,6 @@ background: url("../js/tinymce/themes/advanced/skins/default/img/menu_arrow.gif") no-repeat top right; } - /* Progress,Resize */ .wp_themeSkin .mceBlocker { position: absolute; @@ -583,7 +581,6 @@ border: 1px dotted gray; } - /* Formats */ .wp_themeSkin .mce_p span.mceText {} .wp_themeSkin .mce_address span.mceText { @@ -624,7 +621,6 @@ font-size: 12px; } - /* Theme */ .wp_themeSkin span.mce_undo {background-position:-500px -20px} .wp_themeSkin .mceButtonEnabled:hover span.mce_undo, @@ -769,7 +765,6 @@ .wp_themeSkin .mce_backcolor span.mceAction {background-position:-760px 0} .wp_themeSkin .mce_backcolorpicker {background-position:-760px 0} - /* Plugins */ .wp_themeSkin span.mce_advhr {background-position:-0px -20px} .wp_themeSkin span.mce_ltr {background-position:-20px -20px} @@ -818,7 +813,6 @@ .wp_themeSkin span.mce_ins {background-position:-960px -20px} .wp_themeSkin span.mce_pagebreak {background-position:0 -40px} - /* border */ .wp_themeSkin .mceExternalToolbar, .wp_themeSkin .mceButton, @@ -939,7 +933,6 @@ border-color: #909090; } - .wp_themeSkin table.mceSplitButton td { background-color: #eee; /* Fallback */ background-image: -ms-linear-gradient(bottom, #ddd, #fff); /* IE10 */ @@ -1166,7 +1159,6 @@ html[dir="rtl"] .wp-switch-editor { background-color: #ccc; } - /*------------------------------------------------------------------------------ wp-link ------------------------------------------------------------------------------*/ @@ -1361,7 +1353,6 @@ html[dir="rtl"] .wp-switch-editor { float: right; } - /* * Based on: * jQuery UI CSS Framework @VERSION @@ -1386,19 +1377,16 @@ html[dir="rtl"] .wp-switch-editor { /* end clearfix */ .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } - /* Interaction Cues ----------------------------------*/ .ui-state-disabled { cursor: default !important; } - /* Icons ----------------------------------*/ /* states and images */ .ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } - /* Misc visuals ----------------------------------*/ diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index 1ccddba349..a04d2161cf 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -2029,7 +2029,6 @@ function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims)) return $innerHTML; - $innerHTML = esc_attr($post->post_title); return apply_filters('attachment_innerHTML', $innerHTML, $post->ID); @@ -2129,7 +2128,6 @@ function wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false } } - /** * Escaping for HTML attributes. * diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 9f439a09ad..08e88ce2ef 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2026,7 +2026,6 @@ function wp_nonce_ays( $action ) { wp_die( $html, $title, array('response' => 403) ); } - /** * Kill WordPress execution and display HTML message with error message. * diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index fdbe04c18d..1f1e2040c2 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -1229,7 +1229,6 @@ function get_calendar($initial = true, $echo = true) { } } - // See how much we should pad in the beginning $pad = calendar_week_mod(date('w', $unixmonth)-$week_begins); if ( 0 != $pad ) diff --git a/wp-includes/js/wp-pointer.dev.js b/wp-includes/js/wp-pointer.dev.js index 0cb111bbb9..e1238fd3ce 100644 --- a/wp-includes/js/wp-pointer.dev.js +++ b/wp-includes/js/wp-pointer.dev.js @@ -46,7 +46,6 @@ if ( family.filter(function(){ return 'fixed' === $(this).css('position'); }).length ) positioning = 'fixed'; - this.pointer = $('
') .append( this.content ) .append( this.arrow ) diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 3ba9797a92..4009c46b14 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -630,7 +630,6 @@ function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) { else $link = apply_filters( 'taxonomy_feed_link', $link, $feed, $taxonomy ); - return $link; } diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php index 2134ebe2f4..577e8196d4 100644 --- a/wp-includes/plugin.php +++ b/wp-includes/plugin.php @@ -308,7 +308,6 @@ function current_filter() { return end( $wp_current_filter ); } - /** * Hooks a function on to a specific action. * @@ -332,7 +331,6 @@ function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1) return add_filter($tag, $function_to_add, $priority, $accepted_args); } - /** * Execute functions hooked on a specific action hook. * diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index 978e169e9a..c5f053d15b 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -79,7 +79,6 @@ function the_title_attribute( $args = '' ) { $r = wp_parse_args($args, $defaults); extract( $r, EXTR_SKIP ); - $title = $before . $title . $after; $title = esc_attr(strip_tags($title)); diff --git a/wp-includes/post.php b/wp-includes/post.php index 7583d8e3c8..606557670c 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -1831,7 +1831,6 @@ function wp_count_posts( $type = 'post', $perm = '' ) { return $stats; } - /** * Count number of attachments for the mime type(s). * @@ -2775,7 +2774,6 @@ function check_and_publish_future_post($post_id) { return wp_publish_post($post_id); } - /** * Computes a unique slug for the post, when given the desired slug and some post details. * @@ -2866,7 +2864,6 @@ function wp_add_post_tags($post_id = 0, $tags = '') { return wp_set_post_tags($post_id, $tags, true); } - /** * Set the tags for a post. * diff --git a/wp-includes/query.php b/wp-includes/query.php index 80cbb3adf8..ba0ffb054b 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -27,7 +27,6 @@ function get_query_var($var) { return $wp_query->get($var); } - /** * Retrieve the currently-queried object. Wrapper for $wp_query->get_queried_object() * @@ -3195,7 +3194,6 @@ class WP_Query { return (bool) $this->is_date; } - /** * Is the query for a day archive? * diff --git a/wp-includes/rss.php b/wp-includes/rss.php index 8e67b7145d..479315e234 100644 --- a/wp-includes/rss.php +++ b/wp-includes/rss.php @@ -63,7 +63,6 @@ class MagpieRSS { if ( !is_resource($parser) ) trigger_error( "Failed to create an instance of PHP's XML parser. http://www.php.net/manual/en/ref.xml.php"); - $this->parser = $parser; # pass in parser, and a reference to this object @@ -167,7 +166,6 @@ class MagpieRSS { $this->incontent = $el; - } // if inside an Atom content construct (e.g. content or summary) field treat tags as text @@ -434,7 +432,6 @@ function fetch_rss ($url) { debug($cache->ERROR, E_USER_WARNING); } - $cache_status = 0; // response of check_cache $request_headers = array(); // HTTP headers to send with fetch $rss = 0; // parsed RSS object diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 2abb7c4cbb..974943f9cd 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -122,7 +122,6 @@ function get_taxonomies( $args = array(), $output = 'names', $operator = 'and' ) return wp_filter_object_list($wp_taxonomies, $args, $operator, $field); } - /** * Return all of the taxonomy names that are of $object_type. * @@ -2498,7 +2497,6 @@ function wp_update_term_count_now( $terms, $taxonomy ) { // Cache // - /** * Removes the taxonomy relationship to terms from the cache. * @@ -2528,7 +2526,6 @@ function clean_object_term_cache($object_ids, $object_type) { do_action('clean_object_term_cache', $object_ids, $object_type); } - /** * Will remove all of the term ids from the cache. * @@ -2589,7 +2586,6 @@ function clean_term_cache($ids, $taxonomy = '', $clean_taxonomy = true) { wp_cache_set('last_changed', time(), 'terms'); } - /** * Retrieves the taxonomy relationship to the term object id. * @@ -2608,7 +2604,6 @@ function &get_object_term_cache($id, $taxonomy) { return $cache; } - /** * Updates the cache for Term ID(s). * @@ -2678,7 +2673,6 @@ function update_object_term_cache($object_ids, $object_type) { } } - /** * Updates Terms to Taxonomy in cache. * @@ -2703,7 +2697,6 @@ function update_term_cache($terms, $taxonomy = '') { // Private // - /** * Retrieves children of taxonomy as Term IDs. * @@ -2736,7 +2729,6 @@ function _get_term_hierarchy($taxonomy) { return $children; } - /** * Get the subset of $terms that are descendants of $term_id. * @@ -2793,7 +2785,6 @@ function &_get_term_children($term_id, $terms, $taxonomy) { return $term_list; } - /** * Add count of children to parent count. * @@ -2903,7 +2894,6 @@ 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/theme-compat/comments.php b/wp-includes/theme-compat/comments.php index 5bbfe15790..89a888c75d 100644 --- a/wp-includes/theme-compat/comments.php +++ b/wp-includes/theme-compat/comments.php @@ -51,7 +51,6 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3. -
diff --git a/wp-includes/theme-compat/header.php b/wp-includes/theme-compat/header.php index 6795b16534..2758773b1e 100644 --- a/wp-includes/theme-compat/header.php +++ b/wp-includes/theme-compat/header.php @@ -40,7 +40,6 @@ if ( empty($withcomments) && !is_single() ) { >
-