Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

One newline is enough. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19684 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2012-01-05 20:10:39 +00:00
parent fafe61b247
commit 616c35e71c
65 changed files with 7 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
readme.html
View File

@ -104,6 +104,5 @@
<h1>License</h1>
<p>WordPress is free software, and is released under the terms of the <abbr title="GNU General Public License">GPL</abbr> version 2 or (at your option) any later version. See <a href="license.txt">license.txt</a>.</p>
</body>
</html>

1
wp-admin/admin-ajax.php
View File

@ -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 );

1
wp-admin/admin.php
View File

@ -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)));

2
wp-admin/css/colors-classic.dev.css
View File

@ -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;

1
wp-admin/css/colors-fresh.dev.css
View File

@ -1294,7 +1294,6 @@ table.widefat .spam a:hover,
}
/* end screen icons */
/* Diff */
table.diff .diff-deletedline {
background-color: #fdd;

3
wp-admin/css/farbtastic.css
View File

@ -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;
}

1
wp-admin/css/ie.dev.css
View File

@ -422,7 +422,6 @@ table.ie-fixed {
margin-left: 0;
}
/* IE6 leftovers */
* html .row-actions {
visibility: visible;

1
wp-admin/css/install.dev.css
View File

@ -228,7 +228,6 @@ textarea {
background-color: #ffffe0;
}
/* install-rtl */
body.rtl {
font-family: Tahoma, arial;

1
wp-admin/css/media.dev.css
View File

@ -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;
}

21
wp-admin/css/wp-admin-rtl.dev.css
View File

@ -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;

5
wp-admin/css/wp-admin.dev.css
View File

@ -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 */

2
wp-admin/custom-header.php
View File

@ -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 {
<table class="form-table">
<tbody>
<tr valign="top">
<th scope="row"><?php _e( 'Preview' ); ?></th>
<td >

1
wp-admin/import.php
View File

@ -23,7 +23,6 @@ get_current_screen()->add_help_tab( array(
'<p>' . __('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.') . '</p>',
) );
get_current_screen()->set_help_sidebar(
'<p><strong>' . __('For more information:') . '</strong></p>' .
'<p>' . __('<a href="http://codex.wordpress.org/Tools_Import_Screen" target="_blank">Documentation on Import</a>') . '</p>' .

1
wp-admin/includes/class-wp-ms-users-list-table.php
View File

@ -162,7 +162,6 @@ class WP_MS_Users_List_Table extends WP_List_Table {
$attributes = "$class$style";
switch ( $column_name ) {
case 'cb': ?>
<th scope="row" class="check-column">

1
wp-admin/includes/class-wp-upgrader.php
View File

@ -1362,7 +1362,6 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
else
$install_actions['plugins_page'] = '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Return to Plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>';
if ( ! $this->result || is_wp_error($this->result) ) {
unset( $install_actions['activate_plugin'] );
unset( $install_actions['network_activate'] );

1
wp-admin/includes/dashboard.php
View File

@ -327,7 +327,6 @@ function wp_dashboard_right_now() {
do_action('right_now_content_table_end');
echo "\n\t</table>\n\t</div>";
echo "\n\t".'<div class="table table_discussion">';
echo "\n\t".'<p class="sub">' . __('Discussion') . '</p>'."\n\t".'<table>';
echo "\n\t".'<tr class="first">';

1
wp-admin/includes/deprecated.php
View File

@ -197,7 +197,6 @@ function use_codepress() {
return;
}
/**
* @deprecated 3.1.0
*

1
wp-admin/includes/image-edit.php
View File

@ -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);

18
wp-admin/includes/meta-boxes.php
View File

@ -135,8 +135,6 @@ echo esc_html( $visibility_trans ); ?></span>
<input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked(is_sticky($post->ID)); ?> />
<?php endif; ?>
<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr( $visibility ); ?>" />
<input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br />
<?php if ( $post_type == 'post' && current_user_can( 'edit_others_posts' ) ) : ?>
<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked( is_sticky( $post->ID ) ); ?> tabindex="4" /> <label for="sticky" class="selectit"><?php _e( 'Stick this post to the front page' ); ?></label><br /></span>
@ -261,7 +259,6 @@ function post_format_meta_box( $post, $box ) {
<?php endif; endif;
}
/**
* Display post tags form fields.
*
@ -303,7 +300,6 @@ function post_tags_meta_box($post, $box) {
<?php
}
/**
* Display post categories form fields.
*
@ -369,7 +365,6 @@ function post_categories_meta_box( $post, $box ) {
<?php
}
/**
* Display post excerpt form fields.
*
@ -384,7 +379,6 @@ function post_excerpt_meta_box($post) {
<?php
}
/**
* Display trackback links form fields.
*
@ -411,7 +405,6 @@ if ( ! empty($pings) )
echo $pings;
}
/**
* Display custom fields form fields.
*
@ -436,7 +429,6 @@ meta_form(); ?>
<?php
}
/**
* Display comments status form fields.
*
@ -500,7 +492,6 @@ function post_comment_meta_box($post) {
wp_comment_trashnotice();
}
/**
* Display slug form fields.
*
@ -514,7 +505,6 @@ function post_slug_meta_box($post) {
<?php
}
/**
* Display form field with list of authors.
*
@ -535,7 +525,6 @@ function post_author_meta_box($post) {
) );
}
/**
* Display list of revisions.
*
@ -547,7 +536,6 @@ function post_revisions_meta_box($post) {
wp_list_post_revisions();
}
// -- Page related Meta Boxes
/**
@ -596,7 +584,6 @@ function page_attributes_meta_box($post) {
<?php
}
// -- Link related Meta Boxes
/**
@ -658,7 +645,6 @@ if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('m
<?php
}
/**
* Display link categories form fields.
*
@ -702,7 +688,6 @@ function link_categories_meta_box($link) { ?>
<?php
}
/**
* Display form fields for changing link target.
*
@ -726,7 +711,6 @@ function link_target_meta_box($link) { ?>
<?php
}
/**
* Display checked checkboxes attribute for xfn microformat options.
*
@ -757,7 +741,6 @@ function xfn_check( $class, $value = '', $deprecated = '' ) {
}
}
/**
* Display xfn form fields.
*
@ -877,7 +860,6 @@ function link_xfn_meta_box($link) {
<?php
}
/**
* Display advanced link options form fields.
*

1
wp-admin/includes/misc.php
View File

@ -340,7 +340,6 @@ function set_screen_options() {
if ( in_array( $type, get_taxonomies()) )
$map_option = 'edit_tags_per_page';
switch ( $map_option ) {
case 'edit_per_page':
case 'users_per_page':

4
wp-admin/includes/nav-menu.php
View File

@ -324,7 +324,6 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
}
} elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) {
if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
query_posts(array(
@ -711,7 +710,6 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
</ul>
</div><!-- /.tabs-panel -->
<div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
?>">
@ -767,7 +765,6 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
<?php endif; ?>
</div><!-- /.tabs-panel -->
<p class="button-controls">
<span class="list-controls">
<a href="<?php
@ -1125,7 +1122,6 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
return $menu;
}
}
/**

1
wp-admin/includes/plugin.php
View File

@ -1246,7 +1246,6 @@ function add_comments_page( $page_title, $menu_title, $capability, $menu_slug, $
return add_submenu_page( 'edit-comments.php', $page_title, $menu_title, $capability, $menu_slug, $function );
}
/**
* Remove a top level admin menu
*

2
wp-admin/includes/template.php
View File

@ -8,7 +8,6 @@
* @subpackage Administration
*/
//
// Category Checklists
//
@ -728,7 +727,6 @@ function the_attachment_links( $id = false ) {
<?php
}
/**
* Print out <option> html elements for role selectors
*

1
wp-admin/includes/theme.php
View File

@ -89,7 +89,6 @@ function delete_theme($template, $redirect = '') {
return;
}
if ( ! is_object($wp_filesystem) )
return new WP_Error('fs_unavailable', __('Could not access filesystem.'));

1
wp-admin/index.php
View File

@ -27,7 +27,6 @@ if ( is_user_admin() )
else
add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
$help = '<p>' . __( 'Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the upper corner.' ) . '</p>';
get_current_screen()->add_help_tab( array(

1
wp-admin/js/dashboard.dev.js
View File

@ -22,7 +22,6 @@ jQuery(document).ready( function($) {
$('#wp_welcome_panel-hide').prop('checked', false);
});
welcomePanelHide.click( function() {
welcomePanel.toggleClass('hidden', ! this.checked );
updateWelcomePanel( this.checked ? 1 : 0 );

2
wp-admin/js/edit-comments.dev.js
View File

@ -239,7 +239,6 @@ setCommentsList = function() {
}
}
if ( ! theExtraList || theExtraList.size() == 0 || theExtraList.children().size() == 0 || untrash || unspam ) {
return;
}
@ -554,7 +553,6 @@ $(document).ready(function(){
commentReply.init();
$(document).delegate('span.delete a.delete', 'click', function(){return false;});
if ( typeof $.table_hotkeys != 'undefined' ) {
make_hotkeys_redirect = function(which) {
return function() {

1
wp-admin/js/wp-fullscreen.dev.js
View File

@ -708,7 +708,6 @@ PubSub.prototype.publish = function( topic, args ) {
})()
};
/**
* Resize API
*

1
wp-admin/load-scripts.php
View File

@ -21,7 +21,6 @@ function __() {}
*/
function _x() {}
/**
* @ignore
*/

1
wp-admin/load-styles.php
View File

@ -21,7 +21,6 @@ function __() {}
*/
function _x() {}
/**
* @ignore
*/

1
wp-admin/media.php
View File

@ -145,5 +145,4 @@ default:
endswitch;
?>

4
wp-admin/nav-menus.php
View File

@ -117,7 +117,6 @@ switch ( $action ) {
wp_update_post($next_item_data);
}
// the item is last but still has a parent, so bubble up
} elseif (
! empty( $menu_item_data['menu_item_parent'] ) &&
@ -152,7 +151,6 @@ switch ( $action ) {
}
}
// if this menu item is not first
if ( ! empty( $dbids_to_orders[$menu_item_id] ) && ! empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ) {
@ -228,7 +226,6 @@ switch ( $action ) {
check_admin_referer( 'delete-menu_item_' . $menu_item_id );
if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )
$messages[] = '<div id="message" class="updated"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
break;
@ -615,5 +612,4 @@ require_once( './admin-header.php' );
</div><!-- /#nav-menus-frame -->
</div><!-- /.wrap-->
<?php include( './admin-footer.php' ); ?>

1
wp-admin/network/menu.php
View File

@ -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' );

1
wp-admin/network/themes.php
View File

@ -95,7 +95,6 @@ if ( $action ) {
screen_icon();
echo '<h2>' . esc_html( $title ) . '</h2>';
$url = self_admin_url('update.php?action=update-selected-themes&amp;themes=' . urlencode( join(',', $themes) ));
$url = wp_nonce_url($url, 'bulk-update-themes');

1
wp-admin/network/user-new.php
View File

@ -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'),

1
wp-admin/options-permalink.php
View File

@ -142,7 +142,6 @@ else
$wp_rewrite->flush_rules();
if (isset($_POST['submit'])) : ?>
<div id="message" class="updated"><p><?php
if ( ! is_multisite() ) {

2
wp-admin/options-writing.php
View File

@ -28,7 +28,6 @@ get_current_screen()->add_help_tab( array(
'content' => '<p>' . __('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&#8217;ll be on your way to easier content creation. Clicking on it while on another website opens a popup window with all these options.') . '</p>',
) );
if ( is_multisite() ) {
$post_email_help = '<p>' . __('Due to security issues, you cannot use Post By Email on Multisite Installs.') . '</p>';
} else {
@ -120,7 +119,6 @@ wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_link_category
<?php do_settings_fields('writing', 'default'); ?>
</table>
<h3 class="title"><?php _e('Press This') ?></h3>
<p><?php _e('Press This is a bookmarklet: a little app that runs in your browser and lets you grab bits of the web.');?></p>
<p><?php _e('Use Press This to clip text, images and videos from any web page. Then edit and add more straight from Press This before you save or publish it in a post on your site.'); ?></p>

1
wp-admin/options.php
View File

@ -221,7 +221,6 @@ endforeach;
</form>
</div>
<?php
include('./admin-footer.php');
?>

1
wp-admin/plugins.php
View File

@ -117,7 +117,6 @@ if ( $action ) {
screen_icon();
echo '<h2>' . esc_html( $title ) . '</h2>';
$url = self_admin_url('update.php?action=update-selected&amp;plugins=' . urlencode( join(',', $plugins) ));
$url = wp_nonce_url($url, 'bulk-update-plugins');

2
wp-admin/update-core.php
View File

@ -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(
'<p>' . __('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.') . '</p>'
) );
get_current_screen()->set_help_sidebar(
'<p><strong>' . __('For more information:') . '</strong></p>' .
'<p>' . __('<a href="http://codex.wordpress.org/Dashboard_Updates_Screen" target="_blank">Documentation on Updating WordPress</a>') . '</p>' .

2
wp-admin/user-edit.php
View File

@ -36,7 +36,6 @@ if ( current_user_can('edit_users') && !is_user_admin() )
else
$parent_file = 'profile.php';
$profile_help = '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
'<p>' . __('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.') . '</p>' .
'<p>' . __('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.') . '</p>' .
@ -75,7 +74,6 @@ function use_ssl_preference($user) {
<?php
}
// Only allow super admins on multisite to edit every user.
if ( is_multisite() && ! current_user_can( 'manage_network_users' ) && $user_id != $current_user->ID && ! apply_filters( 'enable_edit_any_user_configuration', true ) )
wp_die( __( 'You do not have permission to edit this user.' ) );

5
wp-includes/category-template.php
View File

@ -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 .= "</select>\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.
*

3
wp-includes/category.php
View File

@ -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.
*

2
wp-includes/class-http.php
View File

@ -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'] );

2
wp-includes/class-wp-xmlrpc-server.php
View File

@ -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);

1
wp-includes/comment.php
View File

@ -394,7 +394,6 @@ function get_comment_statuses( ) {
return $status;
}
/**
* The date the last comment was modified.
*

1
wp-includes/css/admin-bar.dev.css
View File

@ -48,7 +48,6 @@
background-image: linear-gradient(bottom, #373737, #464646 5px); /* proposed W3C Markup */
}
#wpadminbar .ab-sub-wrapper,
#wpadminbar ul,
#wpadminbar ul li {

12
wp-includes/css/editor-buttons.dev.css
View File

@ -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
----------------------------------*/

2
wp-includes/deprecated.php
View File

@ -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.
*

1
wp-includes/functions.php
View File

@ -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.
*

1
wp-includes/general-template.php
View File

@ -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 )

1
wp-includes/js/wp-pointer.dev.js
View File

@ -46,7 +46,6 @@
if ( family.filter(function(){ return 'fixed' === $(this).css('position'); }).length )
positioning = 'fixed';
this.pointer = $('<div />')
.append( this.content )
.append( this.arrow )

1
wp-includes/link-template.php
View File

@ -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;
}

2
wp-includes/plugin.php
View File

@ -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.
*

1
wp-includes/post-template.php
View File

@ -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));

3
wp-includes/post.php
View File

@ -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.
*

2
wp-includes/query.php
View File

@ -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?
*

3
wp-includes/rss.php
View File

@ -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

10
wp-includes/taxonomy.php
View File

@ -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 );

1
wp-includes/theme-compat/comments.php
View File

@ -51,7 +51,6 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.
<?php endif; ?>
<?php endif; ?>
<?php if ( comments_open() ) : ?>
<div id="respond">

1
wp-includes/theme-compat/header.php
View File

@ -40,7 +40,6 @@ if ( empty($withcomments) && !is_single() ) {
<body <?php body_class(); ?>>
<div id="page">
<div id="header" role="banner">
<div id="headerimg">
<h1><a href="<?php echo home_url(); ?>/"><?php bloginfo('name'); ?></a></h1>

3
wp-includes/user.php
View File

@ -65,7 +65,6 @@ function wp_signon( $credentials = '', $secure_cookie = '' ) {
return $user;
}
/**
* Authenticate the user using the username and password.
*/
@ -359,7 +358,6 @@ class WP_User_Query {
var $query_orderby;
var $query_limit;
/**
* PHP5 constructor
*
@ -1460,7 +1458,6 @@ function wp_create_user($username, $password, $email = '') {
return wp_insert_user($userdata);
}
/**
* Return a list of meta keys that wp_insert_user() is supposed to set.
*

1
wp-includes/widgets.php
View File

@ -681,7 +681,6 @@ function wp_sidebar_description( $id ) {
return esc_html( $wp_registered_sidebars[$id]['description'] );
}
/**
* Remove widget from sidebar.
*

3
wp-includes/wp-diff.php
View File

@ -210,7 +210,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
// row < 0: a blank row for that column
list($orig_matches, $final_matches, $orig_rows, $final_rows) = $this->interleave_changed_lines( $orig, $final );
// These will hold the word changes as determined by an inline diff
$orig_diffs = array();
$final_diffs = array();
@ -329,7 +328,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
ksort($orig_matches);
ksort($final_matches);
// Stores rows and blanks for each column.
$orig_rows = $orig_rows_copy = array_keys($orig_matches);
$final_rows = array_keys($final_matches);
@ -353,7 +351,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
}
}
// Pad the ends with blank rows if the columns aren't the same length
$diff_count = count($orig_rows) - count($final_rows);
if ( $diff_count < 0 ) {

1
wp-settings.php
View File

@ -105,7 +105,6 @@ require( ABSPATH . WPINC . '/l10n.php' );
// Run the installer if WordPress is not installed.
wp_not_installed();
// Load most of WordPress.
require( ABSPATH . WPINC . '/class-wp-walker.php' );
require( ABSPATH . WPINC . '/class-wp-ajax-response.php' );