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

Use one space, not two, after trailing punctuation. fixes #19537 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-12-13 23:45:31 +00:00
parent 6b581a9cdf
commit 07ff8b216b
88 changed files with 230 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-activate.php
View File

@ -63,9 +63,9 @@ get_header();
<?php <?php
echo '<p class="lead-in">'; echo '<p class="lead-in">';
if ( $signup->domain . $signup->path == '' ) { if ( $signup->domain . $signup->path == '' ) {
printf( __('Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, wp_lostpassword_url() ); printf( __('Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, wp_lostpassword_url() );
} else { } else {
printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, wp_lostpassword_url() ); printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, wp_lostpassword_url() );
} }
echo '</p>'; echo '</p>';
} else { } else {

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

@ -970,7 +970,7 @@ case 'autosave' : // The name of this action is hardcoded in edit_post()
// Drafts and auto-drafts are just overwritten by autosave // Drafts and auto-drafts are just overwritten by autosave
if ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) { if ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) {
$id = edit_post(); $id = edit_post();
} else { // Non drafts are not overwritten. The autosave is stored in a special post revision. } else { // Non drafts are not overwritten. The autosave is stored in a special post revision.
$revision_id = wp_create_post_autosave( $post->ID ); $revision_id = wp_create_post_autosave( $post->ID );
if ( is_wp_error($revision_id) ) if ( is_wp_error($revision_id) )
$id = $revision_id; $id = $revision_id;

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

@ -676,7 +676,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
$oitar = $width / HEADER_IMAGE_WIDTH; $oitar = $width / HEADER_IMAGE_WIDTH;
$image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file)); $image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
if ( is_wp_error( $image ) ) if ( is_wp_error( $image ) )
wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) ); wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
$image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication $image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication
@ -737,7 +737,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
$cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT ); $cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT );
if ( is_wp_error( $cropped ) ) if ( is_wp_error( $cropped ) )
wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) ); wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication

2
wp-admin/edit-form-advanced.php
View File

@ -87,7 +87,7 @@ $form_extra .= "<input type='hidden' id='post_ID' name='post_ID' value='" . esc_
if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) { if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {
foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) { foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) { if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
$notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) ); $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
break; break;
} }
} }

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

@ -80,7 +80,7 @@ case 'delete':
} }
$tag_ID = (int) $_REQUEST['tag_ID']; $tag_ID = (int) $_REQUEST['tag_ID'];
check_admin_referer( 'delete-tag_' . $tag_ID ); check_admin_referer( 'delete-tag_' . $tag_ID );
if ( !current_user_can( $tax->cap->delete_terms ) ) if ( !current_user_can( $tax->cap->delete_terms ) )
wp_die( __( 'Cheatin&#8217; uh?' ) ); wp_die( __( 'Cheatin&#8217; uh?' ) );

2
wp-admin/import.php
View File

@ -20,7 +20,7 @@ get_current_screen()->add_help_tab( array(
'id' => 'overview', 'id' => 'overview',
'title' => __('Overview'), 'title' => __('Overview'),
'content' => '<p>' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '</p>' . 'content' => '<p>' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '</p>' .
'<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>', '<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>',
) ); ) );

2
wp-admin/includes/class-wp-filesystem-direct.php
View File

@ -207,7 +207,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
if ( ! $overwrite && $this->exists($destination) ) if ( ! $overwrite && $this->exists($destination) )
return false; return false;
// try using rename first. if that fails (for example, source is read only) try copy // try using rename first. if that fails (for example, source is read only) try copy
if ( @rename($source, $destination) ) if ( @rename($source, $destination) )
return true; return true;

2
wp-admin/includes/class-wp-ms-sites-list-table.php
View File

@ -251,7 +251,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
$actions['deactivate'] = '<span class="activate"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ), 'confirm') ) . '">' . __( 'Deactivate' ) . '</a></span>'; $actions['deactivate'] = '<span class="activate"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ), 'confirm') ) . '">' . __( 'Deactivate' ) . '</a></span>';
if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' ) if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
$actions['unarchive'] = '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . __( 'Unarchive' ) . '</a></span>'; $actions['unarchive'] = '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . __( 'Unarchive' ) . '</a></span>';
else else
$actions['archive'] = '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . _x( 'Archive', 'verb; site' ) . '</a></span>'; $actions['archive'] = '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . _x( 'Archive', 'verb; site' ) . '</a></span>';

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

@ -242,7 +242,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
if ( get_blog_status( $val->userblog_id, 'archived' ) == 1 ) if ( get_blog_status( $val->userblog_id, 'archived' ) == 1 )
$class .= 'site-archived '; $class .= 'site-archived ';
$actions['view'] = '<a class="' . $class . '" href="' . esc_url( get_home_url( $val->userblog_id ) ) . '">' . __( 'View' ) . '</a>'; $actions['view'] = '<a class="' . $class . '" href="' . esc_url( get_home_url( $val->userblog_id ) ) . '">' . __( 'View' ) . '</a>';
$actions = apply_filters('ms_user_list_site_actions', $actions, $val->userblog_id); $actions = apply_filters('ms_user_list_site_actions', $actions, $val->userblog_id);

2
wp-admin/includes/class-wp-terms-list-table.php
View File

@ -42,7 +42,7 @@ class WP_Terms_List_Table extends WP_List_Table {
function prepare_items() { function prepare_items() {
global $taxonomy; global $taxonomy;
$tags_per_page = $this->get_items_per_page( 'edit_' . $taxonomy . '_per_page' ); $tags_per_page = $this->get_items_per_page( 'edit_' . $taxonomy . '_per_page' );
if ( 'post_tag' == $taxonomy ) { if ( 'post_tag' == $taxonomy ) {
$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page ); $tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );

2
wp-admin/includes/class-wp-themes-list-table.php
View File

@ -149,7 +149,7 @@ class WP_Themes_List_Table extends WP_List_Table {
$activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=".urlencode( $template )."&amp;stylesheet=".urlencode( $stylesheet ), 'switch-theme_' . $template ); $activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=".urlencode( $template )."&amp;stylesheet=".urlencode( $stylesheet ), 'switch-theme_' . $template );
$activate_text = esc_attr( sprintf( __( 'Activate &#8220;%s&#8221;' ), $title ) ); $activate_text = esc_attr( sprintf( __( 'Activate &#8220;%s&#8221;' ), $title ) );
$actions = array(); $actions = array();
$actions[] = '<a href="' . $activate_link . '" class="activatelink" title="' . $activate_text . '">' . __( 'Activate' ) . '</a>'; $actions[] = '<a href="' . $activate_link . '" class="activatelink" title="' . $activate_text . '">' . __( 'Activate' ) . '</a>';
$actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $theme_name ) ) . '">' . __( 'Preview' ) . '</a>'; $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $theme_name ) ) . '">' . __( 'Preview' ) . '</a>';
if ( ! is_multisite() && current_user_can( 'delete_themes' ) ) if ( ! is_multisite() && current_user_can( 'delete_themes' ) )
$actions[] = '<a class="submitdelete deletion" href="' . wp_nonce_url( "themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet ) . '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n 'Cancel' to stop, 'OK' to delete." ), $theme_name ) ) . "' );" . '">' . __( 'Delete' ) . '</a>'; $actions[] = '<a class="submitdelete deletion" href="' . wp_nonce_url( "themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet ) . '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n 'Cancel' to stop, 'OK' to delete." ), $theme_name ) ) . "' );" . '">' . __( 'Delete' ) . '</a>';

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

@ -1419,7 +1419,7 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
$install_actions = array( $install_actions = array(
'preview' => '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>', 'preview' => '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>',
'activate' => '<a href="' . $activate_link . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>' 'activate' => '<a href="' . $activate_link . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>'
); );
if ( is_network_admin() && current_user_can( 'manage_network_themes' ) ) if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
@ -1475,7 +1475,7 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
$activate_link = wp_nonce_url("themes.php?action=activate&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template); $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
$update_actions['preview'] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>'; $update_actions['preview'] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>';
$update_actions['activate'] = '<a href="' . $activate_link . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>'; $update_actions['activate'] = '<a href="' . $activate_link . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>';
if ( ( ! $this->result || is_wp_error($this->result) ) || $stylesheet == get_stylesheet() ) if ( ( ! $this->result || is_wp_error($this->result) ) || $stylesheet == get_stylesheet() )
unset($update_actions['preview'], $update_actions['activate']); unset($update_actions['preview'], $update_actions['activate']);

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

@ -209,9 +209,9 @@ class WP_Users_List_Table extends WP_List_Table {
* @since 2.1.0 * @since 2.1.0
* *
* @param object $user_object * @param object $user_object
* @param string $style Optional. Attributes added to the TR element. Must be sanitized. * @param string $style Optional. Attributes added to the TR element. Must be sanitized.
* @param string $role Key for the $wp_roles array. * @param string $role Key for the $wp_roles array.
* @param int $numposts Optional. Post count to display for this user. Defaults to zero, as in, a new user has made zero posts. * @param int $numposts Optional. Post count to display for this user. Defaults to zero, as in, a new user has made zero posts.
* @return string * @return string
*/ */
function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) { function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) {

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

@ -273,7 +273,7 @@ function wp_dashboard_right_now() {
echo '</tr><tr>'; echo '</tr><tr>';
/* TODO: Show status breakdown on hover /* TODO: Show status breakdown on hover
if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can
$post_type_texts[] = '<a href="edit-pages.php">'.sprintf( _n( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'</a>'; $post_type_texts[] = '<a href="edit-pages.php">'.sprintf( _n( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'</a>';
} }
if ( $can_edit_posts && !empty($num_posts->draft) ) { if ( $can_edit_posts && !empty($num_posts->draft) ) {
@ -1115,7 +1115,7 @@ function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number]) ) { if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number]) ) {
$_POST['widget-rss'][$number] = stripslashes_deep( $_POST['widget-rss'][$number] ); $_POST['widget-rss'][$number] = stripslashes_deep( $_POST['widget-rss'][$number] );
$widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] ); $widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] );
// title is optional. If black, fill it if possible // title is optional. If black, fill it if possible
if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) { if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) {
$rss = fetch_feed($widget_options[$widget_id]['url']); $rss = fetch_feed($widget_options[$widget_id]['url']);
if ( is_wp_error($rss) ) { if ( is_wp_error($rss) ) {

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

@ -133,7 +133,7 @@ function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $le
* @deprecated Use register_setting() * @deprecated Use register_setting()
* @see register_setting() * @see register_setting()
* *
* @param string $option_group A settings group name. Should correspond to a whitelisted option key name. * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
* Default whitelisted option key names include "general," "discussion," and "reading," among others. * Default whitelisted option key names include "general," "discussion," and "reading," among others.
* @param string $option_name The name of an option to sanitize and save. * @param string $option_name The name of an option to sanitize and save.
* @param unknown_type $sanitize_callback A callback function that sanitizes the option's value. * @param unknown_type $sanitize_callback A callback function that sanitizes the option's value.
@ -870,7 +870,7 @@ function type_url_form_file() {
* @deprecated Use get_current_screen()->add_help_tab() * @deprecated Use get_current_screen()->add_help_tab()
* @see WP_Screen * @see WP_Screen
* *
* @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions. * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
* @param string $help The content of an 'Overview' help tab. * @param string $help The content of an 'Overview' help tab.
*/ */
function add_contextual_help( $screen, $help ) { function add_contextual_help( $screen, $help ) {

4
wp-admin/includes/file.php
View File

@ -240,7 +240,7 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) {
// You may define your own function and pass the name in $overrides['upload_error_handler'] // You may define your own function and pass the name in $overrides['upload_error_handler']
$upload_error_handler = 'wp_handle_upload_error'; $upload_error_handler = 'wp_handle_upload_error';
// You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully. // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully.
if ( isset( $file['error'] ) && !is_numeric( $file['error'] ) && $file['error'] ) if ( isset( $file['error'] ) && !is_numeric( $file['error'] ) && $file['error'] )
return $upload_error_handler( $file, $file['error'] ); return $upload_error_handler( $file, $file['error'] );
@ -364,7 +364,7 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) {
/** /**
* Handle sideloads, which is the process of retrieving a media item from another server instead of * Handle sideloads, which is the process of retrieving a media item from another server instead of
* a traditional media upload. This process involves sanitizing the filename, checking extensions * a traditional media upload. This process involves sanitizing the filename, checking extensions
* for mime type, and moving the file to the appropriate directory within the uploads directory. * for mime type, and moving the file to the appropriate directory within the uploads directory.
* *
* @since 2.6.0 * @since 2.6.0

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

@ -192,7 +192,7 @@ function wp_image_editor($post_id, $msg = false) {
</tbody></table> </tbody></table>
<div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div> <div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div>
<script type="text/javascript">imageEdit.init(<?php echo $post_id; ?>);</script> <script type="text/javascript">imageEdit.init(<?php echo $post_id; ?>);</script>
<div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e("There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor."); ?></div> <div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e("There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor."); ?></div>
</div> </div>
<?php <?php
} }

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

@ -205,7 +205,7 @@ function wp_read_image_metadata( $file ) {
// exif contains a bunch of data we'll probably never need formatted in ways // exif contains a bunch of data we'll probably never need formatted in ways
// that are difficult to use. We'll normalize it and just extract the fields // that are difficult to use. We'll normalize it and just extract the fields
// that are likely to be useful. Fractions and numbers are converted to // that are likely to be useful. Fractions and numbers are converted to
// floats, dates to unix timestamps, and everything else to strings. // floats, dates to unix timestamps, and everything else to strings.
$meta = array( $meta = array(
'aperture' => 0, 'aperture' => 0,

4
wp-admin/includes/ms.php
View File

@ -49,7 +49,7 @@ add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' );
* @since 3.0.0 * @since 3.0.0
* *
* @param int $blog_id Blog ID * @param int $blog_id Blog ID
* @param bool $drop True if blog's table should be dropped. Default is false. * @param bool $drop True if blog's table should be dropped. Default is false.
* @return void * @return void
*/ */
function wpmu_delete_blog( $blog_id, $drop = false ) { function wpmu_delete_blog( $blog_id, $drop = false ) {
@ -774,7 +774,7 @@ var tb_closeImage = "../../wp-includes/js/thickbox/tb-close.png";
* Plugins can alter this criteria using the 'wp_is_large_network' filter. * Plugins can alter this criteria using the 'wp_is_large_network' filter.
* *
* @since 3.3.0 * @since 3.3.0
* @param string $using 'sites or 'users'. Default is 'sites'. * @param string $using 'sites or 'users'. Default is 'sites'.
* @return bool True if the network meets the criteria for large. False otherwise. * @return bool True if the network meets the criteria for large. False otherwise.
*/ */
function wp_is_large_network( $using = 'sites' ) { function wp_is_large_network( $using = 'sites' ) {

2
wp-admin/includes/plugin-install.php
View File

@ -199,7 +199,7 @@ function install_plugin_install_status($api, $loop = false) {
} }
if ( 'install' == $status ) { if ( 'install' == $status ) {
if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) { if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) {
$installed_plugin = get_plugins('/' . $api->slug); $installed_plugin = get_plugins('/' . $api->slug);
if ( empty($installed_plugin) ) { if ( empty($installed_plugin) ) {
if ( current_user_can('install_plugins') ) if ( current_user_can('install_plugins') )

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

@ -985,8 +985,8 @@ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability,
} }
// If the parent doesn't already have a submenu, add a link to the parent // If the parent doesn't already have a submenu, add a link to the parent
// as the first item in the submenu. If the submenu file is the same as the // as the first item in the submenu. If the submenu file is the same as the
// parent file someone is trying to link back to the parent manually. In // parent file someone is trying to link back to the parent manually. In
// this case, don't automatically add a link back to avoid duplication. // this case, don't automatically add a link back to avoid duplication.
if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) { if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
foreach ( (array)$menu as $parent_menu ) { foreach ( (array)$menu as $parent_menu ) {
@ -1002,7 +1002,7 @@ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability,
add_action( $hookname, $function ); add_action( $hookname, $function );
$_registered_pages[$hookname] = true; $_registered_pages[$hookname] = true;
// backwards-compatibility for plugins using add_management page. See wp-admin/admin.php for redirect from edit.php to tools.php // backwards-compatibility for plugins using add_management page. See wp-admin/admin.php for redirect from edit.php to tools.php
if ( 'tools.php' == $parent_slug ) if ( 'tools.php' == $parent_slug )
$_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true; $_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true;
@ -1589,7 +1589,7 @@ function user_can_access_admin_page() {
* *
* @since 2.7.0 * @since 2.7.0
* *
* @param string $option_group A settings group name. Should correspond to a whitelisted option key name. * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
* Default whitelisted option key names include "general," "discussion," and "reading," among others. * Default whitelisted option key names include "general," "discussion," and "reading," among others.
* @param string $option_name The name of an option to sanitize and save. * @param string $option_name The name of an option to sanitize and save.
* @param unknown_type $sanitize_callback A callback function that sanitizes the option's value. * @param unknown_type $sanitize_callback A callback function that sanitizes the option's value.
@ -1715,7 +1715,7 @@ function remove_option_whitelist( $del_options, $options = '' ) {
* *
* @since 2.7.0 * @since 2.7.0
* *
* @param string $option_group A settings group name. This should match the group name used in register_setting(). * @param string $option_group A settings group name. This should match the group name used in register_setting().
*/ */
function settings_fields($option_group) { function settings_fields($option_group) {
echo "<input type='hidden' name='option_page' value='" . esc_attr($option_group) . "' />"; echo "<input type='hidden' name='option_page' value='" . esc_attr($option_group) . "' />";

4
wp-admin/includes/post.php
View File

@ -1259,7 +1259,7 @@ function wp_create_post_autosave( $post_id ) {
if ( is_wp_error( $translated ) ) if ( is_wp_error( $translated ) )
return $translated; return $translated;
// Only store one autosave. If there is already an autosave, overwrite it. // Only store one autosave. If there is already an autosave, overwrite it.
if ( $old_autosave = wp_get_post_autosave( $post_id ) ) { if ( $old_autosave = wp_get_post_autosave( $post_id ) ) {
$new_autosave = _wp_post_revision_fields( $_POST, true ); $new_autosave = _wp_post_revision_fields( $_POST, true );
$new_autosave['ID'] = $old_autosave->ID; $new_autosave['ID'] = $old_autosave->ID;
@ -1320,7 +1320,7 @@ function post_preview() {
if ( 'draft' == $post->post_status ) { if ( 'draft' == $post->post_status ) {
$id = edit_post(); $id = edit_post();
} else { // Non drafts are not overwritten. The autosave is stored in a special post revision. } else { // Non drafts are not overwritten. The autosave is stored in a special post revision.
$id = wp_create_post_autosave( $post->ID ); $id = wp_create_post_autosave( $post->ID );
if ( ! is_wp_error($id) ) if ( ! is_wp_error($id) )
$id = $post->ID; $id = $post->ID;

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

@ -30,7 +30,7 @@ if ( ! empty( $wpdb->collate ) )
* @since 3.3.0 * @since 3.3.0
* *
* @param string $scope Optional. The tables for which to retrieve SQL. Can be all, global, ms_global, or blog tables. Defaults to all. * @param string $scope Optional. The tables for which to retrieve SQL. Can be all, global, ms_global, or blog tables. Defaults to all.
* @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID. * @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID.
* @return string The SQL needed to create the requested tables. * @return string The SQL needed to create the requested tables.
*/ */
function wp_get_db_schema( $scope = 'all', $blog_id = null ) { function wp_get_db_schema( $scope = 'all', $blog_id = null ) {

8
wp-admin/includes/screen.php
View File

@ -208,7 +208,7 @@ function set_current_screen( $hook_name = '' ) {
*/ */
final class WP_Screen { final class WP_Screen {
/** /**
* Any action associated with the screen. 'add' for *-add.php and *-new.php screens. Empty otherwise. * Any action associated with the screen. 'add' for *-add.php and *-new.php screens. Empty otherwise.
* *
* @since 3.3.0 * @since 3.3.0
* @var string * @var string
@ -217,7 +217,7 @@ final class WP_Screen {
public $action; public $action;
/** /**
* The base type of the screen. This is typically the same as $id but with any post types and taxonomies stripped. * The base type of the screen. This is typically the same as $id but with any post types and taxonomies stripped.
* For example, for an $id of 'edit-post' the base is 'edit'. * For example, for an $id of 'edit-post' the base is 'edit'.
* *
* @since 3.3.0 * @since 3.3.0
@ -539,7 +539,7 @@ final class WP_Screen {
* *
* @since 3.3.0 * @since 3.3.0
* *
* @param string $parent_file The parent file of the screen. Typically the $parent_file global. * @param string $parent_file The parent file of the screen. Typically the $parent_file global.
*/ */
function set_parentage( $parent_file ) { function set_parentage( $parent_file ) {
$this->parent_file = $parent_file; $this->parent_file = $parent_file;
@ -809,7 +809,7 @@ final class WP_Screen {
$welcome_checked = false; $welcome_checked = false;
} }
echo '<label for="wp_welcome_panel-hide">'; echo '<label for="wp_welcome_panel-hide">';
echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />'; echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
echo __( 'Welcome' ) . "</label>\n"; echo __( 'Welcome' ) . "</label>\n";
} }
?> ?>

4
wp-admin/includes/taxonomy.php
View File

@ -86,7 +86,7 @@ function wp_create_categories($categories, $post_id = '') {
* *
* @param mixed $catarr See defaults below. Set 'cat_ID' to a non-zero value to update an existing category. The 'taxonomy' key was added in 3.0.0. * @param mixed $catarr See defaults below. Set 'cat_ID' to a non-zero value to update an existing category. The 'taxonomy' key was added in 3.0.0.
* @param bool $wp_error Optional, since 2.5.0. Set this to true if the caller handles WP_Error return values. * @param bool $wp_error Optional, since 2.5.0. Set this to true if the caller handles WP_Error return values.
* @return int|object The ID number of the new or updated Category on success. Zero or a WP_Error on failure, depending on param $wp_error. * @return int|object The ID number of the new or updated Category on success. Zero or a WP_Error on failure, depending on param $wp_error.
*/ */
function wp_insert_category($catarr, $wp_error = false) { function wp_insert_category($catarr, $wp_error = false) {
$cat_defaults = array('cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => ''); $cat_defaults = array('cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '');
@ -145,7 +145,7 @@ function wp_insert_category($catarr, $wp_error = false) {
* *
* @since 2.0.0 * @since 2.0.0
* *
* @param array $catarr The 'cat_ID' value is required. All other keys are optional. * @param array $catarr The 'cat_ID' value is required. All other keys are optional.
* @return int|bool The ID number of the new or updated Category on success. Zero or FALSE on failure. * @return int|bool The ID number of the new or updated Category on success. Zero or FALSE on failure.
*/ */
function wp_update_category($catarr) { function wp_update_category($catarr) {

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

@ -253,7 +253,7 @@ function theme_update_available( $theme ) {
$theme_name = is_object($theme) ? $theme->name : (is_array($theme) ? $theme['Name'] : ''); $theme_name = is_object($theme) ? $theme->name : (is_array($theme) ? $theme['Name'] : '');
$details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list. $details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
$update_url = wp_nonce_url('update.php?action=upgrade-theme&amp;theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet); $update_url = wp_nonce_url('update.php?action=upgrade-theme&amp;theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet);
$update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Updating this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to update.") ) . '\') ) {return true;}return false;"'; $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Updating this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to update.") ) . '\') ) {return true;}return false;"';
if ( !is_multisite() ) { if ( !is_multisite() ) {
if ( ! current_user_can('update_themes') ) if ( ! current_user_can('update_themes') )

18
wp-admin/includes/upgrade.php
View File

@ -58,8 +58,8 @@ function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated
if ( ! $public ) if ( ! $public )
update_option('default_pingback_flag', 0); update_option('default_pingback_flag', 0);
// Create default user. If the user already exists, the user tables are // Create default user. If the user already exists, the user tables are
// being shared among blogs. Just set the role in that case. // being shared among blogs. Just set the role in that case.
$user_id = username_exists($user_name); $user_id = username_exists($user_name);
$user_password = trim($user_password); $user_password = trim($user_password);
$email_password = false; $email_password = false;
@ -358,7 +358,7 @@ function wp_upgrade() {
$wp_current_db_version = __get_option('db_version'); $wp_current_db_version = __get_option('db_version');
// We are up-to-date. Nothing to do. // We are up-to-date. Nothing to do.
if ( $wp_db_version == $wp_current_db_version ) if ( $wp_db_version == $wp_current_db_version )
return; return;
@ -394,7 +394,7 @@ function upgrade_all() {
global $wp_current_db_version, $wp_db_version, $wp_rewrite; global $wp_current_db_version, $wp_db_version, $wp_rewrite;
$wp_current_db_version = __get_option('db_version'); $wp_current_db_version = __get_option('db_version');
// We are up-to-date. Nothing to do. // We are up-to-date. Nothing to do.
if ( $wp_db_version == $wp_current_db_version ) if ( $wp_db_version == $wp_current_db_version )
return; return;
@ -646,7 +646,7 @@ function upgrade_130() {
$active_plugins = __get_option('active_plugins'); $active_plugins = __get_option('active_plugins');
// If plugins are not stored in an array, they're stored in the old // If plugins are not stored in an array, they're stored in the old
// newline separated format. Convert to new format. // newline separated format. Convert to new format.
if ( !is_array( $active_plugins ) ) { if ( !is_array( $active_plugins ) ) {
$active_plugins = explode("\n", trim($active_plugins)); $active_plugins = explode("\n", trim($active_plugins));
update_option('active_plugins', $active_plugins); update_option('active_plugins', $active_plugins);
@ -898,9 +898,9 @@ function upgrade_230() {
$wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) ); $wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
} }
// < 3570 we used linkcategories. >= 3570 we used categories and link2cat. // < 3570 we used linkcategories. >= 3570 we used categories and link2cat.
if ( $wp_current_db_version < 3570 ) { if ( $wp_current_db_version < 3570 ) {
// Create link_category terms for link categories. Create a map of link cat IDs // Create link_category terms for link categories. Create a map of link cat IDs
// to link_category terms. // to link_category terms.
$link_cat_id_map = array(); $link_cat_id_map = array();
$default_link_cat = 0; $default_link_cat = 0;
@ -1690,7 +1690,7 @@ function make_site_theme_from_oldschool($theme_name, $template) {
return false; return false;
// Copy files from the old locations to the site theme. // Copy files from the old locations to the site theme.
// TODO: This does not copy arbitrary include dependencies. Only the // TODO: This does not copy arbitrary include dependencies. Only the
// standard WP files are copied. // standard WP files are copied.
$files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php'); $files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
@ -1938,7 +1938,7 @@ function pre_schema_upgrade() {
// Upgrade versions prior to 2.9 // Upgrade versions prior to 2.9
if ( $wp_current_db_version < 11557 ) { if ( $wp_current_db_version < 11557 ) {
// Delete duplicate options. Keep the option with the highest option_id. // Delete duplicate options. Keep the option with the highest option_id.
$wpdb->query("DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id"); $wpdb->query("DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id");
// Drop the old primary key and add the new. // Drop the old primary key and add the new.

2
wp-admin/install.php
View File

@ -207,7 +207,7 @@ switch($step) {
$error = true; $error = true;
} elseif ( ! is_email( $admin_email ) ) { } elseif ( ! is_email( $admin_email ) ) {
// TODO: poka-yoke // TODO: poka-yoke
display_setup_form( __( 'that isn&#8217;t a valid e-mail address. E-mail addresses look like: <code>username@example.com</code>' ) ); display_setup_form( __( 'that isn&#8217;t a valid e-mail address. E-mail addresses look like: <code>username@example.com</code>' ) );
$error = true; $error = true;
} }

2
wp-admin/js/common.dev.js
View File

@ -316,7 +316,7 @@ $(document).ready( function() {
var el = e.target, selStart = el.selectionStart, selEnd = el.selectionEnd, val = el.value, scroll, sel; var el = e.target, selStart = el.selectionStart, selEnd = el.selectionEnd, val = el.value, scroll, sel;
try { try {
this.lastKey = 9; // not a standard DOM property, lastKey is to help stop Opera tab event. See blur handler below. this.lastKey = 9; // not a standard DOM property, lastKey is to help stop Opera tab event. See blur handler below.
} catch(err) {} } catch(err) {}
if ( document.selection ) { if ( document.selection ) {

10
wp-admin/maint/repair.php
View File

@ -19,7 +19,7 @@ header( 'Content-Type: text/html; charset=utf-8' );
<?php <?php
if ( !defined('WP_ALLOW_REPAIR') ) { if ( !defined('WP_ALLOW_REPAIR') ) {
echo '<p>'.__('To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file. Once this line is added to your config, reload this page.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>"; echo '<p>'.__('To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file. Once this line is added to your config, reload this page.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
} elseif ( isset($_GET['repair']) ) { } elseif ( isset($_GET['repair']) ) {
check_admin_referer('repair_db'); check_admin_referer('repair_db');
@ -49,7 +49,7 @@ if ( !defined('WP_ALLOW_REPAIR') ) {
printf( __( 'The %s table is okay.' ), $table ); printf( __( 'The %s table is okay.' ), $table );
} else { } else {
/* translators: 1: table name, 2: error message, */ /* translators: 1: table name, 2: error message, */
printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;' ) , $table, "<code>$check->Msg_text</code>" ); printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;' ) , $table, "<code>$check->Msg_text</code>" );
$repair = $wpdb->get_row("REPAIR TABLE $table"); $repair = $wpdb->get_row("REPAIR TABLE $table");
@ -95,16 +95,16 @@ if ( !defined('WP_ALLOW_REPAIR') ) {
$problem_output[] = "$table: $problem"; $problem_output[] = "$table: $problem";
echo '<textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( implode("\n", $problem_output) ) . '</textarea>'; echo '<textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( implode("\n", $problem_output) ) . '</textarea>';
} else { } else {
echo '<p>'.__('Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>"; echo '<p>'.__('Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
} }
} else { } else {
if ( isset($_GET['referrer']) && 'is_blog_installed' == $_GET['referrer'] ) if ( isset($_GET['referrer']) && 'is_blog_installed' == $_GET['referrer'] )
_e('One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.'); _e('One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.');
else else
_e('WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.') _e('WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.')
?> ?>
<p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=1', 'repair_db') ?>"><?php _e( 'Repair Database' ); ?></a></p> <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=1', 'repair_db') ?>"><?php _e( 'Repair Database' ); ?></a></p>
<?php _e('WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.'); ?> <?php _e('WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.'); ?>
<p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=2', 'repair_db') ?>"><?php _e( 'Repair and Optimize Database' ); ?></a></p> <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=2', 'repair_db') ?>"><?php _e( 'Repair and Optimize Database' ); ?></a></p>
<?php <?php
} }

2
wp-admin/network/settings.php
View File

@ -322,7 +322,7 @@ if ( isset( $_GET['updated'] ) ) {
$menu_perms = get_site_option( 'menu_items' ); $menu_perms = get_site_option( 'menu_items' );
$menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) ); $menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
foreach ( (array) $menu_items as $key => $val ) { foreach ( (array) $menu_items as $key => $val ) {
echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[$key] ) ? checked( $menu_perms[$key], '1', false ) : '' ) . " /> " . esc_html( $val ) . "</label><br/>"; echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[$key] ) ? checked( $menu_perms[$key], '1', false ) : '' ) . " /> " . esc_html( $val ) . "</label><br/>";
} }
?> ?>
</td> </td>

2
wp-admin/network/site-info.php
View File

@ -108,7 +108,7 @@ $tabs = array(
); );
foreach ( $tabs as $tab_id => $tab ) { foreach ( $tabs as $tab_id => $tab ) {
$class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>'; echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
} }
?> ?>
</h3> </h3>

2
wp-admin/network/site-settings.php
View File

@ -98,7 +98,7 @@ $tabs = array(
); );
foreach ( $tabs as $tab_id => $tab ) { foreach ( $tabs as $tab_id => $tab ) {
$class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>'; echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
} }
?> ?>
</h3> </h3>

2
wp-admin/network/site-themes.php
View File

@ -152,7 +152,7 @@ $tabs = array(
); );
foreach ( $tabs as $tab_id => $tab ) { foreach ( $tabs as $tab_id => $tab ) {
$class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>'; echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
} }
?> ?>
</h3><?php </h3><?php

2
wp-admin/network/site-users.php
View File

@ -186,7 +186,7 @@ $tabs = array(
); );
foreach ( $tabs as $tab_id => $tab ) { foreach ( $tabs as $tab_id => $tab ) {
$class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>'; echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
} }
?> ?>
</h3><?php </h3><?php

4
wp-admin/options-discussion.php
View File

@ -164,7 +164,7 @@ printf( __('Comments should be displayed with the %s comments at the top of each
<h3><?php _e('Avatars'); ?></h3> <h3><?php _e('Avatars'); ?></h3>
<p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.'); ?></p> <p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.'); ?></p>
<?php // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that? ?> <?php // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that? ?>
@ -228,7 +228,7 @@ $size = 32;
$avatar_list = ''; $avatar_list = '';
foreach ( $avatar_defaults as $default_key => $default_name ) { foreach ( $avatar_defaults as $default_key => $default_name ) {
$selected = ($default == $default_key) ? 'checked="checked" ' : ''; $selected = ($default == $default_key) ? 'checked="checked" ' : '';
$avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='" . esc_attr($default_key) . "' {$selected}/> "; $avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='" . esc_attr($default_key) . "' {$selected}/> ";
$avatar = get_avatar( $user_email, $size, $default_key ); $avatar = get_avatar( $user_email, $size, $default_key );
$avatar_list .= preg_replace("/src='(.+?)'/", "src='\$1&amp;forcedefault=1'", $avatar); $avatar_list .= preg_replace("/src='(.+?)'/", "src='\$1&amp;forcedefault=1'", $avatar);

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

@ -151,7 +151,7 @@ $tzstring = get_option('timezone_string');
$check_zone_info = true; $check_zone_info = true;
// Remove old Etc mappings. Fallback to gmt_offset. // Remove old Etc mappings. Fallback to gmt_offset.
if ( false !== strpos($tzstring,'Etc/GMT') ) if ( false !== strpos($tzstring,'Etc/GMT') )
$tzstring = ''; $tzstring = '';

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

@ -32,7 +32,7 @@ get_current_screen()->add_help_tab( array(
if ( is_multisite() ) { if ( is_multisite() ) {
$post_email_help = '<p>' . __('Due to security issues, you cannot use Post By Email on Multisite Installs.') . '</p>'; $post_email_help = '<p>' . __('Due to security issues, you cannot use Post By Email on Multisite Installs.') . '</p>';
} else { } else {
$post_email_help = '<p>' . __('Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.') . '</p>'; $post_email_help = '<p>' . __('Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.') . '</p>';
} }
get_current_screen()->add_help_tab( array( get_current_screen()->add_help_tab( array(

2
wp-admin/plugin-editor.php
View File

@ -236,7 +236,7 @@ foreach ( $plugin_files as $plugin_file ) :
<?php endif; ?> <?php endif; ?>
<?php if ( is_writeable($real_file) ) : ?> <?php if ( is_writeable($real_file) ) : ?>
<?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?> <?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?>
<p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p> <p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
<?php } ?> <?php } ?>
<p class="submit"> <p class="submit">
<?php <?php

2
wp-admin/plugins.php
View File

@ -355,7 +355,7 @@ if ( !empty($invalid) )
if ( isset( $_GET['main'] ) ) if ( isset( $_GET['main'] ) )
$errmsg = __( 'You cannot delete a plugin while it is active on the main site.' ); $errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
elseif ( isset($_GET['charsout']) ) elseif ( isset($_GET['charsout']) )
$errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']); $errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
else else
$errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.'); $errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
?> ?>

2
wp-admin/themes.php
View File

@ -76,7 +76,7 @@ require_once('./admin-header.php');
?> ?>
<?php if ( ! validate_current_theme() ) : ?> <?php if ( ! validate_current_theme() ) : ?>
<div id="message1" class="updated"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div> <div id="message1" class="updated"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>
<?php elseif ( isset($_GET['activated']) ) : <?php elseif ( isset($_GET['activated']) ) :
if ( isset($wp_registered_sidebars) && count( (array) $wp_registered_sidebars ) && current_user_can('edit_theme_options') ) { ?> if ( isset($wp_registered_sidebars) && count( (array) $wp_registered_sidebars ) && current_user_can('edit_theme_options') ) { ?>
<div id="message2" class="updated"><p><?php printf( __('New theme activated. This theme supports widgets, please visit the <a href="%s">widgets settings</a> screen to configure them.'), admin_url( 'widgets.php' ) ); ?></p></div><?php <div id="message2" class="updated"><p><?php printf( __('New theme activated. This theme supports widgets, please visit the <a href="%s">widgets settings</a> screen to configure them.'), admin_url( 'widgets.php' ) ); ?></p></div><?php

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

@ -36,7 +36,7 @@ function list_core_update( $update ) {
$mysql_version = $wpdb->db_version(); $mysql_version = $wpdb->db_version();
$show_buttons = true; $show_buttons = true;
if ( 'development' == $update->response ) { if ( 'development' == $update->response ) {
$message = __('You are using a development version of WordPress. You can update to the latest nightly build automatically or download the nightly build and install it manually:'); $message = __('You are using a development version of WordPress. You can update to the latest nightly build automatically or download the nightly build and install it manually:');
$download = __('Download nightly build'); $download = __('Download nightly build');
} else { } else {
if ( $current ) { if ( $current ) {
@ -317,7 +317,7 @@ function list_theme_updates() {
echo " echo "
<tr class='active'> <tr class='active'>
<th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($stylesheet) . "' /></th> <th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($stylesheet) . "' /></th>
<td class='plugin-title'><img src='$screenshot' width='64' height='64' style='float:left; padding: 0 5px 5px' /><strong>{$theme_data->Name}</strong>" . sprintf(__('You have version %1$s installed. Update to %2$s.'), $theme_data->Version, $theme_data->update['new_version']) . "</td> <td class='plugin-title'><img src='$screenshot' width='64' height='64' style='float:left; padding: 0 5px 5px' /><strong>{$theme_data->Name}</strong>" . sprintf(__('You have version %1$s installed. Update to %2$s.'), $theme_data->Version, $theme_data->update['new_version']) . "</td>
</tr>"; </tr>";
} }
?> ?>

2
wp-admin/upgrade.php
View File

@ -27,7 +27,7 @@ if ( isset( $_GET['step'] ) )
else else
$step = 0; $step = 0;
// Do it. No output. // Do it. No output.
if ( 'upgrade_db' === $step ) { if ( 'upgrade_db' === $step ) {
wp_upgrade(); wp_upgrade();
die( '0' ); die( '0' );

6
wp-admin/user-new.php
View File

@ -163,7 +163,7 @@ get_current_screen()->add_help_tab( array(
'content' => '<p>' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '</p>' . 'content' => '<p>' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '</p>' .
'<ul>' . '<ul>' .
'<li>' . __('Administrators have access to all the administration features.') . '</li>' . '<li>' . __('Administrators have access to all the administration features.') . '</li>' .
'<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.') . '</li>' . '<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.') . '</li>' .
'<li>' . __('Authors can publish and manage their own posts, and are able to upload files.') . '</li>' . '<li>' . __('Authors can publish and manage their own posts, and are able to upload files.') . '</li>' .
'<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' . '<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
'<li>' . __('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.') . '</li>' . '<li>' . __('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.') . '</li>' .
@ -251,10 +251,10 @@ if ( is_multisite() ) {
if ( $do_both ) if ( $do_both )
echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>'; echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>';
if ( !is_super_admin() ) { if ( !is_super_admin() ) {
_e( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ); _e( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' );
$label = __('E-mail'); $label = __('E-mail');
} else { } else {
_e( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ); _e( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' );
$label = __('E-mail or Username'); $label = __('E-mail or Username');
} }
?> ?>

2
wp-admin/users.php
View File

@ -33,7 +33,7 @@ get_current_screen()->add_help_tab( array(
'content' => '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' . 'content' => '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
'<ul>' . '<ul>' .
'<li>' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . '</li>' . '<li>' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . '</li>' .
'<li>' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . '</li>' . '<li>' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . '</li>' .
'<li>' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . '</li>' . '<li>' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . '</li>' .
'</ul>' '</ul>'
) ); ) );

4
wp-app.php
View File

@ -285,7 +285,7 @@ class AtomServer {
// check to see if AtomPub is enabled // check to see if AtomPub is enabled
if ( !get_option( 'enable_app' ) ) if ( !get_option( 'enable_app' ) )
$this->forbidden( sprintf( __( 'AtomPub services are disabled on this site. An admin user can enable them at %s' ), admin_url('options-writing.php') ) ); $this->forbidden( sprintf( __( 'AtomPub services are disabled on this site. An admin user can enable them at %s' ), admin_url('options-writing.php') ) );
// dispatch // dispatch
foreach ( $this->selectors as $regex => $funcs ) { foreach ( $this->selectors as $regex => $funcs ) {
@ -370,7 +370,7 @@ EOD;
$categories = ""; $categories = "";
$cats = get_categories(array('hierarchical' => 0, 'hide_empty' => 0)); $cats = get_categories(array('hierarchical' => 0, 'hide_empty' => 0));
foreach ( (array) $cats as $cat ) { foreach ( (array) $cats as $cat ) {
$categories .= " <category term=\"" . esc_attr($cat->name) . "\" />\n"; $categories .= " <category term=\"" . esc_attr($cat->name) . "\" />\n";
} }
$output = <<<EOD $output = <<<EOD
<app:categories xmlns:app="$this->ATOMPUB_NS" <app:categories xmlns:app="$this->ATOMPUB_NS"

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

@ -680,7 +680,7 @@ function _admin_bar_bump_cb() { ?>
/** /**
* Set the display status of the admin bar. * Set the display status of the admin bar.
* *
* This can be called immediately upon plugin load. It does not need to be called from a function hooked to the init action. * This can be called immediately upon plugin load. It does not need to be called from a function hooked to the init action.
* *
* @since 3.1.0 * @since 3.1.0
* *

10
wp-includes/cache.php
View File

@ -51,7 +51,7 @@ function wp_cache_close() {
* @see WP_Object_Cache::decr() * @see WP_Object_Cache::decr()
* *
* @param int|string $key The cache key to increment * @param int|string $key The cache key to increment
* @param int $offset The amount by which to decrement the item's value. Default is 1. * @param int $offset The amount by which to decrement the item's value. Default is 1.
* @param string $group The group the key is in. * @param string $group The group the key is in.
* @return false|int False on failure, the item's new value on success. * @return false|int False on failure, the item's new value on success.
*/ */
@ -120,7 +120,7 @@ function wp_cache_get( $key, $group = '', $force = false ) {
* @see WP_Object_Cache::incr() * @see WP_Object_Cache::incr()
* *
* @param int|string $key The cache key to increment * @param int|string $key The cache key to increment
* @param int $offset The amount by which to increment the item's value. Default is 1. * @param int $offset The amount by which to increment the item's value. Default is 1.
* @param string $group The group the key is in. * @param string $group The group the key is in.
* @return false|int False on failure, the item's new value on success. * @return false|int False on failure, the item's new value on success.
*/ */
@ -204,7 +204,7 @@ function wp_cache_add_non_persistent_groups( $groups ) {
} }
/** /**
* Reset internal cache keys and structures. If the cache backend uses global blog or site IDs as part of its cache keys, * Reset internal cache keys and structures. If the cache backend uses global blog or site IDs as part of its cache keys,
* this function instructs the backend to reset those keys and perform any cleanup since blog or site IDs have changed since cache init. * this function instructs the backend to reset those keys and perform any cleanup since blog or site IDs have changed since cache init.
* *
* @since 2.6.0 * @since 2.6.0
@ -317,7 +317,7 @@ class WP_Object_Cache {
* @since 3.3.0 * @since 3.3.0
* *
* @param int|string $key The cache key to increment * @param int|string $key The cache key to increment
* @param int $offset The amount by which to decrement the item's value. Default is 1. * @param int $offset The amount by which to decrement the item's value. Default is 1.
* @param string $group The group the key is in. * @param string $group The group the key is in.
* @return false|int False on failure, the item's new value on success. * @return false|int False on failure, the item's new value on success.
*/ */
@ -416,7 +416,7 @@ class WP_Object_Cache {
* @since 3.3.0 * @since 3.3.0
* *
* @param int|string $key The cache key to increment * @param int|string $key The cache key to increment
* @param int $offset The amount by which to increment the item's value. Default is 1. * @param int $offset The amount by which to increment the item's value. Default is 1.
* @param string $group The group the key is in. * @param string $group The group the key is in.
* @return false|int False on failure, the item's new value on success. * @return false|int False on failure, the item's new value on success.
*/ */

2
wp-includes/capabilities.php
View File

@ -1208,7 +1208,7 @@ function current_user_can_for_blog( $blog_id, $capability ) {
// Create new object to avoid stomping the global current_user. // Create new object to avoid stomping the global current_user.
$user = new WP_User( $current_user->ID) ; $user = new WP_User( $current_user->ID) ;
// Set the blog id. @todo add blog id arg to WP_User constructor? // Set the blog id. @todo add blog id arg to WP_User constructor?
$user->for_blog( $blog_id ); $user->for_blog( $blog_id );
$args = array_slice( func_get_args(), 2 ); $args = array_slice( func_get_args(), 2 );

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

@ -201,7 +201,7 @@ class WP_Http {
* @param array $args Request arguments * @param array $args Request arguments
* @param string $url URL to Request * @param string $url URL to Request
* *
* @return string|false Class name for the first transport that claims to support the request. False if no transport claims to support the request. * @return string|false Class name for the first transport that claims to support the request. False if no transport claims to support the request.
*/ */
public function _get_first_available_transport( $args, $url = null ) { public function _get_first_available_transport( $args, $url = null ) {
$request_order = array( 'curl', 'streams', 'fsockopen' ); $request_order = array( 'curl', 'streams', 'fsockopen' );
@ -1031,7 +1031,7 @@ class WP_Http_Curl {
$ssl_verify = apply_filters('https_ssl_verify', $ssl_verify); $ssl_verify = apply_filters('https_ssl_verify', $ssl_verify);
// CURLOPT_TIMEOUT and CURLOPT_CONNECTTIMEOUT expect integers. Have to use ceil since // CURLOPT_TIMEOUT and CURLOPT_CONNECTTIMEOUT expect integers. Have to use ceil since
// a value of 0 will allow an unlimited timeout. // a value of 0 will allow an unlimited timeout.
$timeout = (int) ceil( $r['timeout'] ); $timeout = (int) ceil( $r['timeout'] );
curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, $timeout ); curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, $timeout );

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

@ -156,7 +156,7 @@ class wp_xmlrpc_server extends IXR_Server {
*/ */
function login_pass_ok($user_login, $user_pass) { function login_pass_ok($user_login, $user_pass) {
if ( !get_option( 'enable_xmlrpc' ) ) { if ( !get_option( 'enable_xmlrpc' ) ) {
$this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php') ) ); $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php') ) );
return false; return false;
} }
@ -178,7 +178,7 @@ class wp_xmlrpc_server extends IXR_Server {
*/ */
function login($username, $password) { function login($username, $password) {
if ( !get_option( 'enable_xmlrpc' ) ) { if ( !get_option( 'enable_xmlrpc' ) ) {
$this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php') ) ); $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php') ) );
return false; return false;
} }
@ -1945,7 +1945,7 @@ class wp_xmlrpc_server extends IXR_Server {
fclose($f); fclose($f);
/* so it is actually editable with a windows/mac client */ /* so it is actually editable with a windows/mac client */
// FIXME: (or delete me) do we really want to cater to bad clients at the expense of good ones by BEEPing up their line breaks? commented. $content = str_replace("\n", "\r\n", $content); // FIXME: (or delete me) do we really want to cater to bad clients at the expense of good ones by BEEPing up their line breaks? commented. $content = str_replace("\n", "\r\n", $content);
return $content; return $content;
} }
@ -2544,7 +2544,7 @@ class wp_xmlrpc_server extends IXR_Server {
$postdata = wp_get_single_post($post_ID, ARRAY_A); $postdata = wp_get_single_post($post_ID, ARRAY_A);
// If there is no post data for the give post id, stop // If there is no post data for the give post id, stop
// now and return an error. Other wise a new post will be // now and return an error. Other wise a new post will be
// created (which was the old behavior). // created (which was the old behavior).
if ( empty($postdata["ID"]) ) if ( empty($postdata["ID"]) )
return(new IXR_Error(404, __('Invalid post ID.'))); return(new IXR_Error(404, __('Invalid post ID.')));

6
wp-includes/class-wp.php
View File

@ -156,8 +156,8 @@ class WP {
$home_path = trim($home_path, '/'); $home_path = trim($home_path, '/');
// Trim path info from the end and the leading home path from the // Trim path info from the end and the leading home path from the
// front. For path info requests, this leaves us with the requesting // front. For path info requests, this leaves us with the requesting
// filename, if any. For 404 requests, this leaves us with the // filename, if any. For 404 requests, this leaves us with the
// requested permalink. // requested permalink.
$req_uri = str_replace($pathinfo, '', $req_uri); $req_uri = str_replace($pathinfo, '', $req_uri);
$req_uri = trim($req_uri, '/'); $req_uri = trim($req_uri, '/');
@ -401,7 +401,7 @@ class WP {
} }
} }
// query_string filter deprecated. Use request filter instead. // query_string filter deprecated. Use request filter instead.
if ( has_filter('query_string') ) { // Don't bother filtering and parsing if no plugins are hooked in. if ( has_filter('query_string') ) { // Don't bother filtering and parsing if no plugins are hooked in.
$this->query_string = apply_filters('query_string', $this->query_string); $this->query_string = apply_filters('query_string', $this->query_string);
parse_str($this->query_string, $this->query_vars); parse_str($this->query_string, $this->query_vars);

8
wp-includes/class.wp-dependencies.php
View File

@ -28,7 +28,7 @@ class WP_Dependencies {
/** /**
* Do the dependencies * Do the dependencies
* *
* Process the items passed to it or the queue. Processes all dependencies. * Process the items passed to it or the queue. Processes all dependencies.
* *
* @param mixed $handles (optional) items to be processed. (void) processes queue, (string) process that item, (array of strings) process those items * @param mixed $handles (optional) items to be processed. (void) processes queue, (string) process that item, (array of strings) process those items
* @return array Items that have been processed * @return array Items that have been processed
@ -63,7 +63,7 @@ class WP_Dependencies {
/** /**
* Determines dependencies * Determines dependencies
* *
* Recursively builds array of items to process taking dependencies into account. Does NOT catch infinite loops. * Recursively builds array of items to process taking dependencies into account. Does NOT catch infinite loops.
* *
* *
* @param mixed $handles Accepts (string) dep name or (array of strings) dep names * @param mixed $handles Accepts (string) dep name or (array of strings) dep names
@ -90,7 +90,7 @@ class WP_Dependencies {
if ( !isset($this->registered[$handle]) ) if ( !isset($this->registered[$handle]) )
$keep_going = false; // Script doesn't exist $keep_going = false; // Script doesn't exist
elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) ) elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) )
$keep_going = false; // Script requires deps which don't exist (not a necessary check. efficiency?) $keep_going = false; // Script requires deps which don't exist (not a necessary check. efficiency?)
elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $group ) ) elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $group ) )
$keep_going = false; // Script requires deps which don't exist $keep_going = false; // Script requires deps which don't exist
@ -98,7 +98,7 @@ class WP_Dependencies {
if ( $recursion ) if ( $recursion )
return false; // Abort this branch. return false; // Abort this branch.
else else
continue; // We're at the top level. Move on to the next one. continue; // We're at the top level. Move on to the next one.
} }
if ( $queued ) // Already grobbed it and its deps if ( $queued ) // Already grobbed it and its deps

4
wp-includes/class.wp-scripts.php
View File

@ -37,9 +37,9 @@ class WP_Scripts extends WP_Dependencies {
/** /**
* Prints scripts * Prints scripts
* *
* Prints the scripts passed to it or the print queue. Also prints all necessary dependencies. * Prints the scripts passed to it or the print queue. Also prints all necessary dependencies.
* *
* @param mixed $handles (optional) Scripts to be printed. (void) prints queue, (string) prints that script, (array of strings) prints those scripts. * @param mixed $handles (optional) Scripts to be printed. (void) prints queue, (string) prints that script, (array of strings) prints those scripts.
* @param int $group (optional) If scripts were queued in groups prints this group number. * @param int $group (optional) If scripts were queued in groups prints this group number.
* @return array Scripts that have been printed * @return array Scripts that have been printed
*/ */

18
wp-includes/comment-template.php
View File

@ -55,7 +55,7 @@ function comment_author( $comment_ID = 0 ) {
* @uses apply_filters() Calls the 'get_comment_author_email' hook on the comment author email * @uses apply_filters() Calls the 'get_comment_author_email' hook on the comment author email
* @uses $comment * @uses $comment
* *
* @param int $comment_ID The ID of the comment for which to get the author's email. Optional. * @param int $comment_ID The ID of the comment for which to get the author's email. Optional.
* @return string The current comment author's email * @return string The current comment author's email
*/ */
function get_comment_author_email( $comment_ID = 0 ) { function get_comment_author_email( $comment_ID = 0 ) {
@ -141,7 +141,7 @@ function get_comment_author_email_link($linktext='', $before='', $after='') {
* @since 1.5.0 * @since 1.5.0
* @uses apply_filters() Calls 'get_comment_author_link' hook on the complete link HTML or author * @uses apply_filters() Calls 'get_comment_author_link' hook on the complete link HTML or author
* *
* @param int $comment_ID The ID of the comment for which to get the author's link. Optional. * @param int $comment_ID The ID of the comment for which to get the author's link. Optional.
* @return string Comment Author name or HTML link for author's URL * @return string Comment Author name or HTML link for author's URL
*/ */
function get_comment_author_link( $comment_ID = 0 ) { function get_comment_author_link( $comment_ID = 0 ) {
@ -189,7 +189,7 @@ function get_comment_author_IP( $comment_ID = 0 ) {
* @since 0.71 * @since 0.71
* @see get_comment_author_IP() Echoes Result * @see get_comment_author_IP() Echoes Result
* *
* @param int $comment_ID The ID of the comment for which to print the author's IP address. Optional. * @param int $comment_ID The ID of the comment for which to print the author's IP address. Optional.
*/ */
function comment_author_IP( $comment_ID = 0 ) { function comment_author_IP( $comment_ID = 0 ) {
echo get_comment_author_IP( $comment_ID ); echo get_comment_author_IP( $comment_ID );
@ -201,7 +201,7 @@ function comment_author_IP( $comment_ID = 0 ) {
* @since 1.5.0 * @since 1.5.0
* @uses apply_filters() Calls 'get_comment_author_url' hook on the comment author's URL * @uses apply_filters() Calls 'get_comment_author_url' hook on the comment author's URL
* *
* @param int $comment_ID The ID of the comment for which to get the author's URL. Optional. * @param int $comment_ID The ID of the comment for which to get the author's URL. Optional.
* @return string * @return string
*/ */
function get_comment_author_url( $comment_ID = 0 ) { function get_comment_author_url( $comment_ID = 0 ) {
@ -384,7 +384,7 @@ function get_comment_date( $d = '', $comment_ID = 0 ) {
* @since 0.71 * @since 0.71
* *
* @param string $d The format of the date (defaults to user's config) * @param string $d The format of the date (defaults to user's config)
* @param int $comment_ID The ID of the comment for which to print the date. Optional. * @param int $comment_ID The ID of the comment for which to print the date. Optional.
*/ */
function comment_date( $d = '', $comment_ID = 0 ) { function comment_date( $d = '', $comment_ID = 0 ) {
echo get_comment_date( $d, $comment_ID ); echo get_comment_date( $d, $comment_ID );
@ -912,7 +912,7 @@ function comments_template( $file = '/comments.php', $separate_comments = false
if ( file_exists( $include ) ) if ( file_exists( $include ) )
require( $include ); require( $include );
elseif ( file_exists( TEMPLATEPATH . $file ) ) elseif ( file_exists( TEMPLATEPATH . $file ) )
require( TEMPLATEPATH . $file ); require( TEMPLATEPATH . $file );
else // Backward compat code will be removed in a future release else // Backward compat code will be removed in a future release
require( ABSPATH . WPINC . '/theme-compat/comments.php'); require( ABSPATH . WPINC . '/theme-compat/comments.php');
} }
@ -1091,7 +1091,7 @@ function comment_reply_link($args = array(), $comment = null, $post = null) {
* @since 2.7.0 * @since 2.7.0
* *
* @param array $args Optional. Override default options. * @param array $args Optional. Override default options.
* @param int|object $post Optional. Post that the comment is going to be displayed on. Defaults to current post. * @param int|object $post Optional. Post that the comment is going to be displayed on. Defaults to current post.
* @return string|bool|null Link to show comment form, if successful. False, if comments are closed. * @return string|bool|null Link to show comment form, if successful. False, if comments are closed.
*/ */
function get_post_reply_link($args = array(), $post = null) { function get_post_reply_link($args = array(), $post = null) {
@ -1408,7 +1408,7 @@ class Walker_Comment extends Walker {
* @uses Walker_Comment * @uses Walker_Comment
* *
* @param string|array $args Formatting options * @param string|array $args Formatting options
* @param array $comments Optional array of comment objects. Defaults to $wp_query->comments * @param array $comments Optional array of comment objects. Defaults to $wp_query->comments
*/ */
function wp_list_comments($args = array(), $comments = null ) { function wp_list_comments($args = array(), $comments = null ) {
global $wp_query, $comment_alt, $comment_depth, $comment_thread_alt, $overridden_cpage, $in_comment_loop; global $wp_query, $comment_alt, $comment_depth, $comment_thread_alt, $overridden_cpage, $in_comment_loop;
@ -1534,7 +1534,7 @@ function comment_form( $args = array(), $post_id = null ) {
$defaults = array( $defaults = array(
'fields' => apply_filters( 'comment_form_default_fields', $fields ), 'fields' => apply_filters( 'comment_form_default_fields', $fields ),
'comment_field' => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>', 'comment_field' => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',
'must_log_in' => '<p class="must-log-in">' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>', 'must_log_in' => '<p class="must-log-in">' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
'logged_in_as' => '<p class="logged-in-as">' . sprintf( __( 'Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out?</a>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>', 'logged_in_as' => '<p class="logged-in-as">' . sprintf( __( 'Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out?</a>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
'comment_notes_before' => '<p class="comment-notes">' . __( 'Your email address will not be published.' ) . ( $req ? $required_text : '' ) . '</p>', 'comment_notes_before' => '<p class="comment-notes">' . __( 'Your email address will not be published.' ) . ( $req ? $required_text : '' ) . '</p>',
'comment_notes_after' => '<p class="form-allowed-tags">' . sprintf( __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes: %s' ), ' <code>' . allowed_tags() . '</code>' ) . '</p>', 'comment_notes_after' => '<p class="form-allowed-tags">' . sprintf( __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes: %s' ), ' <code>' . allowed_tags() . '</code>' ) . '</p>',

10
wp-includes/comment.php
View File

@ -685,9 +685,9 @@ function check_comment_flood_db( $ip, $email, $date ) {
do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment); do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
if ( defined('DOING_AJAX') ) if ( defined('DOING_AJAX') )
die( __('You are posting comments too quickly. Slow down.') ); die( __('You are posting comments too quickly. Slow down.') );
wp_die( __('You are posting comments too quickly. Slow down.'), '', array('response' => 403) ); wp_die( __('You are posting comments too quickly. Slow down.'), '', array('response' => 403) );
} }
} }
} }
@ -723,7 +723,7 @@ function &separate_comments(&$comments) {
* @uses get_option() Used to fill in defaults for parameters. * @uses get_option() Used to fill in defaults for parameters.
* @uses Walker_Comment * @uses Walker_Comment
* *
* @param array $comments Optional array of comment objects. Defaults to $wp_query->comments * @param array $comments Optional array of comment objects. Defaults to $wp_query->comments
* @param int $per_page Optional comments per page. * @param int $per_page Optional comments per page.
* @param boolean $threaded Optional control over flat or threaded comments. * @param boolean $threaded Optional control over flat or threaded comments.
* @return int Number of comment pages. * @return int Number of comment pages.
@ -1947,7 +1947,7 @@ function update_comment_cache($comments) {
// //
/** /**
* Close comments on old posts on the fly, without any extra DB queries. Hooked to the_posts. * Close comments on old posts on the fly, without any extra DB queries. Hooked to the_posts.
* *
* @access private * @access private
* @since 2.7.0 * @since 2.7.0
@ -1977,7 +1977,7 @@ function _close_comments_for_old_posts( $posts, $query ) {
} }
/** /**
* Close comments on an old post. Hooked to comments_open and pings_open. * Close comments on an old post. Hooked to comments_open and pings_open.
* *
* @access private * @access private
* @since 2.7.0 * @since 2.7.0

2
wp-includes/cron.php
View File

@ -47,7 +47,7 @@ function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
* specific interval, specified by you. The action will trigger when someone * specific interval, specified by you. The action will trigger when someone
* visits your WordPress site, if the scheduled time has passed. * visits your WordPress site, if the scheduled time has passed.
* *
* Valid values for the recurrence are hourly, daily and twicedaily. These can * Valid values for the recurrence are hourly, daily and twicedaily. These can
* be extended using the cron_schedules filter in wp_get_schedules(). * be extended using the cron_schedules filter in wp_get_schedules().
* *
* Use wp_next_scheduled() to prevent duplicates * Use wp_next_scheduled() to prevent duplicates

4
wp-includes/default-constants.php
View File

@ -105,7 +105,7 @@ function wp_plugin_directory_constants( ) {
* @deprecated * @deprecated
*/ */
if ( !defined('PLUGINDIR') ) if ( !defined('PLUGINDIR') )
define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat. define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat.
/** /**
* Allows for the mu-plugins directory to be moved from the default location. * Allows for the mu-plugins directory to be moved from the default location.
@ -130,7 +130,7 @@ function wp_plugin_directory_constants( ) {
* @deprecated * @deprecated
*/ */
if ( !defined( 'MUPLUGINDIR' ) ) if ( !defined( 'MUPLUGINDIR' ) )
define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH. For back compat. define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH. For back compat.
} }
/** /**

2
wp-includes/formatting.php
View File

@ -732,7 +732,7 @@ function sanitize_file_name( $filename ) {
$extension = array_pop($parts); $extension = array_pop($parts);
$mimes = get_allowed_mime_types(); $mimes = get_allowed_mime_types();
// Loop over any intermediate extensions. Munge them with a trailing underscore if they are a 2 - 5 character // Loop over any intermediate extensions. Munge them with a trailing underscore if they are a 2 - 5 character
// long alpha string not in the extension whitelist. // long alpha string not in the extension whitelist.
foreach ( (array) $parts as $part) { foreach ( (array) $parts as $part) {
$filename .= '.' . $part; $filename .= '.' . $part;

8
wp-includes/functions.php
View File

@ -1905,7 +1905,7 @@ function is_blog_installed() {
$suppress = $wpdb->suppress_errors(); $suppress = $wpdb->suppress_errors();
// Loop over the WP tables. If none exist, then scratch install is allowed. // Loop over the WP tables. If none exist, then scratch install is allowed.
// If one or more exist, suggest table repair since we got here because the options // If one or more exist, suggest table repair since we got here because the options
// table could not be accessed. // table could not be accessed.
$wp_tables = $wpdb->tables(); $wp_tables = $wpdb->tables();
@ -1922,7 +1922,7 @@ function is_blog_installed() {
// One or more tables exist. We are insane. // One or more tables exist. We are insane.
// Die with a DB error. // Die with a DB error.
$wpdb->error = sprintf( /*WP_I18N_NO_TABLES*/'One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.'/*/WP_I18N_NO_TABLES*/, 'maint/repair.php?referrer=is_blog_installed' ); $wpdb->error = sprintf( /*WP_I18N_NO_TABLES*/'One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.'/*/WP_I18N_NO_TABLES*/, 'maint/repair.php?referrer=is_blog_installed' );
dead_db(); dead_db();
} }
@ -3785,8 +3785,8 @@ function wp_suspend_cache_addition( $suspend = null ) {
/** /**
* Suspend cache invalidation. * Suspend cache invalidation.
* *
* Turns cache invalidation on and off. Useful during imports where you don't wont to do invalidations * Turns cache invalidation on and off. Useful during imports where you don't wont to do invalidations
* every time a post is inserted. Callers must be sure that what they are doing won't lead to an inconsistent * every time a post is inserted. Callers must be sure that what they are doing won't lead to an inconsistent
* cache when invalidation is suspended. * cache when invalidation is suspended.
* *
* @since 2.7.0 * @since 2.7.0

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

@ -2080,7 +2080,7 @@ function wp_admin_css_uri( $file = 'wp-admin' ) {
* *
* @param string $file Optional. Style handle name or file name (without ".css" extension) relative * @param string $file Optional. Style handle name or file name (without ".css" extension) relative
* to wp-admin/. Defaults to 'wp-admin'. * to wp-admin/. Defaults to 'wp-admin'.
* @param bool $force_echo Optional. Force the stylesheet link to be printed rather than enqueued. * @param bool $force_echo Optional. Force the stylesheet link to be printed rather than enqueued.
*/ */
function wp_admin_css( $file = 'wp-admin', $force_echo = false ) { function wp_admin_css( $file = 'wp-admin', $force_echo = false ) {
global $wp_styles; global $wp_styles;
@ -2091,7 +2091,7 @@ function wp_admin_css( $file = 'wp-admin', $force_echo = false ) {
$handle = 0 === strpos( $file, 'css/' ) ? substr( $file, 4 ) : $file; $handle = 0 === strpos( $file, 'css/' ) ? substr( $file, 4 ) : $file;
if ( $wp_styles->query( $handle ) ) { if ( $wp_styles->query( $handle ) ) {
if ( $force_echo || did_action( 'wp_print_styles' ) ) // we already printed the style queue. Print this one immediately if ( $force_echo || did_action( 'wp_print_styles' ) ) // we already printed the style queue. Print this one immediately
wp_print_styles( $handle ); wp_print_styles( $handle );
else // Add to style queue else // Add to style queue
wp_enqueue_style( $handle ); wp_enqueue_style( $handle );

2
wp-includes/http.php
View File

@ -197,7 +197,7 @@ function wp_remote_retrieve_body(&$response) {
* @since 3.2.0 * @since 3.2.0
* *
* @param array $capabilities Array of capabilities to test or a wp_remote_request() $args array. * @param array $capabilities Array of capabilities to test or a wp_remote_request() $args array.
* @param string $url Optional. If given, will check if the URL requires SSL and adds that requirement to the capabilities array. * @param string $url Optional. If given, will check if the URL requires SSL and adds that requirement to the capabilities array.
* *
* @return bool * @return bool
*/ */

2
wp-includes/js/autosave.dev.js
View File

@ -229,7 +229,7 @@ function autosave_enable_buttons() {
function autosave_disable_buttons() { function autosave_disable_buttons() {
jQuery(':button, :submit', '#submitpost').prop('disabled', true); jQuery(':button, :submit', '#submitpost').prop('disabled', true);
// Re-enable 5 sec later. Just gives autosave a head start to avoid collisions. // Re-enable 5 sec later. Just gives autosave a head start to avoid collisions.
setTimeout(autosave_enable_buttons, 5000); setTimeout(autosave_enable_buttons, 5000);
} }

4
wp-includes/kses.php
View File

@ -10,7 +10,7 @@
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details. * more details.
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
@ -718,7 +718,7 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
* input. It will add quotes around attribute values that don't have any quotes * input. It will add quotes around attribute values that don't have any quotes
* or apostrophes around them, to make it easier to produce HTML code that will * or apostrophes around them, to make it easier to produce HTML code that will
* conform to W3C's HTML specification. It will also remove bad URL protocols * conform to W3C's HTML specification. It will also remove bad URL protocols
* from attribute values. It also reduces duplicate attributes by using the * from attribute values. It also reduces duplicate attributes by using the
* attribute defined first (foo='bar' foo='baz' will result in foo='bar'). * attribute defined first (foo='bar' foo='baz' will result in foo='bar').
* *
* @since 1.0.0 * @since 1.0.0

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

@ -507,7 +507,7 @@ function get_post_comments_feed_link($post_id = 0, $feed = '') {
* @since 2.5.0 * @since 2.5.0
* *
* @param string $link_text Descriptive text. * @param string $link_text Descriptive text.
* @param int $post_id Optional post ID. Default to current post. * @param int $post_id Optional post ID. Default to current post.
* @param string $feed Optional. Feed format. * @param string $feed Optional. Feed format.
* @return string Link to the comment feed for the current post. * @return string Link to the comment feed for the current post.
*/ */
@ -2187,7 +2187,7 @@ function self_admin_url($path = '', $scheme = 'admin') {
/** /**
* Get the URL to the user's dashboard. * Get the URL to the user's dashboard.
* *
* If a user does not belong to any site, the global user dashboard is used. If the user belongs to the current site, * If a user does not belong to any site, the global user dashboard is used. If the user belongs to the current site,
* the dashboard for the current site is returned. If the user cannot edit the current site, the dashboard to the user's * the dashboard for the current site is returned. If the user cannot edit the current site, the dashboard to the user's
* primary blog is returned. * primary blog is returned.
* *

2
wp-includes/load.php
View File

@ -568,7 +568,7 @@ function shutdown_action_hook() {
*/ */
function wp_clone( $object ) { function wp_clone( $object ) {
// Use parens for clone to accommodate PHP 4. See #17880 // Use parens for clone to accommodate PHP 4. See #17880
return clone( $object ); return clone( $object );
} }

2
wp-includes/locale.php
View File

@ -113,7 +113,7 @@ class WP_Locale {
$this->weekday[5] = /* translators: weekday */ __('Friday'); $this->weekday[5] = /* translators: weekday */ __('Friday');
$this->weekday[6] = /* translators: weekday */ __('Saturday'); $this->weekday[6] = /* translators: weekday */ __('Saturday');
// The first letter of each day. The _%day%_initial suffix is a hack to make // The first letter of each day. The _%day%_initial suffix is a hack to make
// sure the day initials are unique. // sure the day initials are unique.
$this->weekday_initial[__('Sunday')] = /* translators: one-letter abbreviation of the weekday */ __('S_Sunday_initial'); $this->weekday_initial[__('Sunday')] = /* translators: one-letter abbreviation of the weekday */ __('S_Sunday_initial');
$this->weekday_initial[__('Monday')] = /* translators: one-letter abbreviation of the weekday */ __('M_Monday_initial'); $this->weekday_initial[__('Monday')] = /* translators: one-letter abbreviation of the weekday */ __('M_Monday_initial');

4
wp-includes/media.php
View File

@ -53,9 +53,9 @@ function image_constrain_size_for_editor($width, $height, $size = 'medium') {
// if no width is set, default to the theme content width if available // if no width is set, default to the theme content width if available
} }
elseif ( $size == 'large' ) { elseif ( $size == 'large' ) {
// we're inserting a large size image into the editor. if it's a really // We're inserting a large size image into the editor. If it's a really
// big image we'll scale it down to fit reasonably within the editor // big image we'll scale it down to fit reasonably within the editor
// itself, and within the theme's content width if it's known. the user // itself, and within the theme's content width if it's known. The user
// can resize it in the editor if they wish. // can resize it in the editor if they wish.
$max_width = intval(get_option('large_size_w')); $max_width = intval(get_option('large_size_w'));
$max_height = intval(get_option('large_size_h')); $max_height = intval(get_option('large_size_h'));

28
wp-includes/meta.php
View File

@ -2,8 +2,8 @@
/** /**
* Metadata API * Metadata API
* *
* Functions for retrieving and manipulating metadata of various WordPress object types. Metadata * Functions for retrieving and manipulating metadata of various WordPress object types. Metadata
* for an object is a represented by a simple key-value pair. Objects may contain multiple * for an object is a represented by a simple key-value pair. Objects may contain multiple
* metadata entries that share the same key and differ only in their value. * metadata entries that share the same key and differ only in their value.
* *
* @package WordPress * @package WordPress
@ -23,8 +23,8 @@
* @param int $object_id ID of the object metadata is for * @param int $object_id ID of the object metadata is for
* @param string $meta_key Metadata key * @param string $meta_key Metadata key
* @param string $meta_value Metadata value * @param string $meta_value Metadata value
* @param bool $unique Optional, default is false. Whether the specified metadata key should be * @param bool $unique Optional, default is false. Whether the specified metadata key should be
* unique for the object. If true, and the object already has a value for the specified * unique for the object. If true, and the object already has a value for the specified
* metadata key, no change will be made * metadata key, no change will be made
* @return bool The meta ID on successful update, false on failure. * @return bool The meta ID on successful update, false on failure.
*/ */
@ -80,7 +80,7 @@ function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique =
} }
/** /**
* Update metadata for the specified object. If no value already exists for the specified object * Update metadata for the specified object. If no value already exists for the specified object
* ID and metadata key, the metadata will be added. * ID and metadata key, the metadata will be added.
* *
* @since 2.9.0 * @since 2.9.0
@ -94,8 +94,8 @@ function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique =
* @param int $object_id ID of the object metadata is for * @param int $object_id ID of the object metadata is for
* @param string $meta_key Metadata key * @param string $meta_key Metadata key
* @param string $meta_value Metadata value * @param string $meta_value Metadata value
* @param string $prev_value Optional. If specified, only update existing metadata entries with * @param string $prev_value Optional. If specified, only update existing metadata entries with
* the specified value. Otherwise, update all entries. * the specified value. Otherwise, update all entries.
* @return bool True on successful update, false on failure. * @return bool True on successful update, false on failure.
*/ */
function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_value = '') { function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_value = '') {
@ -174,10 +174,10 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v
* @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) * @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 int $object_id ID of the object metadata is for
* @param string $meta_key Metadata key * @param string $meta_key Metadata key
* @param string $meta_value Optional. Metadata value. If specified, only delete metadata entries * @param string $meta_value Optional. Metadata value. If specified, only delete metadata entries
* with this value. Otherwise, delete all entries with the specified meta_key. * with this value. Otherwise, delete all entries with the specified meta_key.
* @param bool $delete_all Optional, default is false. If true, delete matching metadata entries * @param bool $delete_all Optional, default is false. If true, delete matching metadata entries
* for all objects, ignoring the specified object_id. Otherwise, only delete matching * for all objects, ignoring the specified object_id. Otherwise, only delete matching
* metadata entries for the specified object_id. * metadata entries for the specified object_id.
* @return bool True on successful delete, false on failure. * @return bool True on successful delete, false on failure.
*/ */
@ -256,10 +256,10 @@ function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $d
* *
* @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) * @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 int $object_id ID of the object metadata is for
* @param string $meta_key Optional. Metadata key. If not specified, retrieve all metadata for * @param string $meta_key Optional. Metadata key. If not specified, retrieve all metadata for
* the specified object. * the specified object.
* @param bool $single Optional, default is false. If true, return only the first value of the * @param bool $single Optional, default is false. If true, return only the first value of the
* specified meta_key. This parameter has no effect if meta_key is not specified. * specified meta_key. This parameter has no effect if meta_key is not specified.
* @return string|array Single metadata value, or array of values * @return string|array Single metadata value, or array of values
*/ */
function get_metadata($meta_type, $object_id, $meta_key = '', $single = false) { function get_metadata($meta_type, $object_id, $meta_key = '', $single = false) {

2
wp-includes/ms-functions.php
View File

@ -880,7 +880,7 @@ function wpmu_activate_signup($key) {
// TODO: What to do if we create a user but cannot create a blog? // TODO: What to do if we create a user but cannot create a blog?
if ( is_wp_error($blog_id) ) { if ( is_wp_error($blog_id) ) {
// If blog is taken, that means a previous attempt to activate this blog failed in between creating the blog and // If blog is taken, that means a previous attempt to activate this blog failed in between creating the blog and
// setting the activation flag. Let's just set the active flag and instruct the user to reset their password. // setting the activation flag. Let's just set the active flag and instruct the user to reset their password.
if ( 'blog_taken' == $blog_id->get_error_code() ) { if ( 'blog_taken' == $blog_id->get_error_code() ) {
$blog_id->add_data( $signup ); $blog_id->add_data( $signup );
$wpdb->update( $wpdb->signups, array( 'active' => 1, 'activated' => $now ), array( 'activation_key' => $key ) ); $wpdb->update( $wpdb->signups, array( 'active' => 1, 'activated' => $now ), array( 'activation_key' => $key ) );

6
wp-includes/nav-menu-template.php
View File

@ -113,7 +113,7 @@ class Walker_Nav_Menu extends Walker {
* *
* Optional $args contents: * Optional $args contents:
* *
* menu - The menu that is desired. Accepts (matching in order) id, slug, name. Defaults to blank. * menu - The menu that is desired. Accepts (matching in order) id, slug, name. Defaults to blank.
* menu_class - CSS class to use for the ul element which forms the menu. Defaults to 'menu'. * menu_class - CSS class to use for the ul element which forms the menu. Defaults to 'menu'.
* menu_id - The ID that is applied to the ul element which forms the menu. Defaults to the menu slug, incremented. * menu_id - The ID that is applied to the ul element which forms the menu. Defaults to the menu slug, incremented.
* container - Whether to wrap the ul, and what to wrap it with. Defaults to 'div'. * container - Whether to wrap the ul, and what to wrap it with. Defaults to 'div'.
@ -125,9 +125,9 @@ class Walker_Nav_Menu extends Walker {
* link_before - Text before the link. * link_before - Text before the link.
* link_after - Text after the link. * link_after - Text after the link.
* echo - Whether to echo the menu or return it. Defaults to echo. * echo - Whether to echo the menu or return it. Defaults to echo.
* depth - how many levels of the hierarchy are to be included. 0 means all. Defaults to 0. * depth - how many levels of the hierarchy are to be included. 0 means all. Defaults to 0.
* walker - allows a custom walker to be specified. * walker - allows a custom walker to be specified.
* theme_location - the location in the theme to be used. Must be registered with register_nav_menu() in order to be selectable by the user. * theme_location - the location in the theme to be used. Must be registered with register_nav_menu() in order to be selectable by the user.
* items_wrap - How the list items should be wrapped. Defaults to a ul with an id and class. Uses printf() format with numbered placeholders. * items_wrap - How the list items should be wrapped. Defaults to a ul with an id and class. Uses printf() format with numbered placeholders.
* *
* @since 3.0.0 * @since 3.0.0

2
wp-includes/nav-menu.php
View File

@ -554,7 +554,7 @@ function wp_get_nav_menu_items( $menu, $args = array() ) {
* - object: The type of object originally represented, such as "category," "post", or "attachment." * - object: The type of object originally represented, such as "category," "post", or "attachment."
* - type_label: The singular label used to describe this type of menu item. * - type_label: The singular label used to describe this type of menu item.
* - post_parent: The DB ID of the original object's parent object, if any (0 otherwise). * - post_parent: The DB ID of the original object's parent object, if any (0 otherwise).
* - menu_item_parent: The DB ID of the nav_menu_item that is this item's menu parent, if any. 0 otherwise. * - menu_item_parent: The DB ID of the nav_menu_item that is this item's menu parent, if any. 0 otherwise.
* - url: The URL to which this menu item points. * - url: The URL to which this menu item points.
* - title: The title of this menu item. * - title: The title of this menu item.
* - target: The target attribute of the link element for this menu item. * - target: The target attribute of the link element for this menu item.

4
wp-includes/pluggable.php
View File

@ -111,8 +111,8 @@ if ( !function_exists('get_user_by') ) :
* *
* @since 2.8.0 * @since 2.8.0
* *
* @param string $field The field to retrieve the user with. id | slug | email | login * @param string $field The field to retrieve the user with. id | slug | email | login
* @param int|string $value A value for $field. A user ID, slug, email address, or login name. * @param int|string $value A value for $field. A user ID, slug, email address, or login name.
* @return bool|object False on failure, WP_User object on success * @return bool|object False on failure, WP_User object on success
*/ */
function get_user_by( $field, $value ) { function get_user_by( $field, $value ) {

6
wp-includes/plugin.php
View File

@ -80,7 +80,7 @@ function add_filter($tag, $function_to_add, $priority = 10, $accepted_args = 1)
* @global array $wp_filter Stores all of the filters * @global array $wp_filter Stores all of the filters
* *
* @param string $tag The name of the filter hook. * @param string $tag The name of the filter hook.
* @param callback $function_to_check optional. If specified, return the priority of that function on this hook or false if not attached. * @param callback $function_to_check optional. If specified, return the priority of that function on this hook or false if not attached.
* @return int|boolean Optionally returns the priority on that hook for the specified function. * @return int|boolean Optionally returns the priority on that hook for the specified function.
*/ */
function has_filter($tag, $function_to_check = false) { function has_filter($tag, $function_to_check = false) {
@ -499,7 +499,7 @@ function do_action_ref_array($tag, $args) {
* @see has_filter() has_action() is an alias of has_filter(). * @see has_filter() has_action() is an alias of has_filter().
* *
* @param string $tag The name of the action hook. * @param string $tag The name of the action hook.
* @param callback $function_to_check optional. If specified, return the priority of that function on this hook or false if not attached. * @param callback $function_to_check optional. If specified, return the priority of that function on this hook or false if not attached.
* @return int|boolean Optionally returns the priority on that hook for the specified function. * @return int|boolean Optionally returns the priority on that hook for the specified function.
*/ */
function has_action($tag, $function_to_check = false) { function has_action($tag, $function_to_check = false) {
@ -744,7 +744,7 @@ function _wp_call_all_hook($args) {
* @global array $wp_filter Storage for all of the filters and actions * @global array $wp_filter Storage for all of the filters and actions
* @param string $tag Used in counting how many hooks were applied * @param string $tag Used in counting how many hooks were applied
* @param callback $function Used for creating unique id * @param callback $function Used for creating unique id
* @param int|bool $priority Used in counting how many hooks were applied. If === false and $function is an object reference, we return the unique id only if it already has one, false otherwise. * @param int|bool $priority Used in counting how many hooks were applied. If === false and $function is an object reference, we return the unique id only if it already has one, false otherwise.
* @return string|bool Unique ID for usage as array key or false if $priority === false and $function is an object reference, and it does not already have a unique id. * @return string|bool Unique ID for usage as array key or false if $priority === false and $function is an object reference, and it does not already have a unique id.
*/ */
function _wp_filter_build_unique_id($tag, $function, $priority) { function _wp_filter_build_unique_id($tag, $function, $priority) {

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

@ -555,7 +555,7 @@ function get_body_class( $class = '' ) {
* *
* @since 2.7.0 * @since 2.7.0
* *
* @param int|object $post An optional post. Global $post used if not provided. * @param int|object $post An optional post. Global $post used if not provided.
* @return bool false if a password is not required or the correct password cookie is present, true otherwise. * @return bool false if a password is not required or the correct password cookie is present, true otherwise.
*/ */
function post_password_required( $post = null ) { function post_password_required( $post = null ) {
@ -1307,7 +1307,7 @@ function wp_post_revision_title( $revision, $link = true ) {
* *
* Second argument controls parameters: * Second argument controls parameters:
* (bool) parent : include the parent (the "Current Revision") in the list. * (bool) parent : include the parent (the "Current Revision") in the list.
* (string) format : 'list' or 'form-table'. 'list' outputs UL, 'form-table' * (string) format : 'list' or 'form-table'. 'list' outputs UL, 'form-table'
* outputs TABLE with UI. * outputs TABLE with UI.
* (int) right : what revision is currently being viewed - used in * (int) right : what revision is currently being viewed - used in
* form-table format. * form-table format.

4
wp-includes/post-thumbnail-template.php
View File

@ -39,7 +39,7 @@ function get_post_thumbnail_id( $post_id = null ) {
* *
* @since 2.9.0 * @since 2.9.0
* *
* @param int $size Optional. Image size. Defaults to 'post-thumbnail', which theme sets using set_post_thumbnail_size( $width, $height, $crop_flag );. * @param int $size Optional. Image size. Defaults to 'post-thumbnail', which theme sets using set_post_thumbnail_size( $width, $height, $crop_flag );.
* @param string|array $attr Optional. Query string or array of attributes. * @param string|array $attr Optional. Query string or array of attributes.
*/ */
function the_post_thumbnail( $size = 'post-thumbnail', $attr = '' ) { function the_post_thumbnail( $size = 'post-thumbnail', $attr = '' ) {
@ -82,7 +82,7 @@ function update_post_thumbnail_cache() {
* @since 2.9.0 * @since 2.9.0
* *
* @param int $post_id Optional. Post ID. * @param int $post_id Optional. Post ID.
* @param string $size Optional. Image size. Defaults to 'thumbnail'. * @param string $size Optional. Image size. Defaults to 'thumbnail'.
* @param string|array $attr Optional. Query string or array of attributes. * @param string|array $attr Optional. Query string or array of attributes.
*/ */
function get_the_post_thumbnail( $post_id = null, $size = 'post-thumbnail', $attr = '' ) { function get_the_post_thumbnail( $post_id = null, $size = 'post-thumbnail', $attr = '' ) {

22
wp-includes/post.php
View File

@ -493,7 +493,7 @@ function get_post_mime_type($ID = '') {
* *
* @param int|object $post A post * @param int|object $post A post
* *
* @return mixed The format if successful. False if no format is set. WP_Error if errors. * @return mixed The format if successful. False if no format is set. WP_Error if errors.
*/ */
function get_post_format( $post = null ) { function get_post_format( $post = null ) {
$post = get_post($post); $post = get_post($post);
@ -531,7 +531,7 @@ function has_post_format( $format, $post = null ) {
* @since 3.1.0 * @since 3.1.0
* *
* @param int|object $post The post for which to assign a format * @param int|object $post The post for which to assign a format
* @param string $format A format to assign. Use an empty string or array to remove all formats from the post. * @param string $format A format to assign. Use an empty string or array to remove all formats from the post.
* @return mixed WP_Error on error. Array of affected term IDs on success. * @return mixed WP_Error on error. Array of affected term IDs on success.
*/ */
function set_post_format( $post, $format ) { function set_post_format( $post, $format ) {
@ -887,7 +887,7 @@ function get_post_types( $args = array(), $output = 'names', $operator = 'and' )
* - supports - An alias for calling add_post_type_support() directly. See {@link add_post_type_support()} * - supports - An alias for calling add_post_type_support() directly. See {@link add_post_type_support()}
* for documentation. Defaults to none. * for documentation. Defaults to none.
* - register_meta_box_cb - Provide a callback function that will be called when setting up the * - register_meta_box_cb - Provide a callback function that will be called when setting up the
* meta boxes for the edit form. Do remove_meta_box() and add_meta_box() calls in the callback. * meta boxes for the edit form. Do remove_meta_box() and add_meta_box() calls in the callback.
* - taxonomies - An array of taxonomy identifiers that will be registered for the post type. * - taxonomies - An array of taxonomy identifiers that will be registered for the post type.
* Default is no taxonomies. Taxonomies can be registered later with register_taxonomy() or * Default is no taxonomies. Taxonomies can be registered later with register_taxonomy() or
* register_taxonomy_for_object_type(). * register_taxonomy_for_object_type().
@ -952,7 +952,7 @@ function register_post_type($post_type, $args = array()) {
if ( null === $args->show_in_admin_bar ) if ( null === $args->show_in_admin_bar )
$args->show_in_admin_bar = true === $args->show_in_menu; $args->show_in_admin_bar = true === $args->show_in_menu;
// Whether to show this type in nav-menus.php. Defaults to the setting for public. // Whether to show this type in nav-menus.php. Defaults to the setting for public.
if ( null === $args->show_in_nav_menus ) if ( null === $args->show_in_nav_menus )
$args->show_in_nav_menus = $args->public; $args->show_in_nav_menus = $args->public;
@ -2005,9 +2005,9 @@ function wp_delete_post( $postid = 0, $force_delete = false ) {
unstick_post($postid); unstick_post($postid);
} }
// Do raw query. wp_get_post_revisions() is filtered // Do raw query. wp_get_post_revisions() is filtered
$revision_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid ) ); $revision_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid ) );
// Use wp_delete_post (via wp_delete_post_revision) again. Ensures any meta/misplaced data gets cleaned up. // Use wp_delete_post (via wp_delete_post_revision) again. Ensures any meta/misplaced data gets cleaned up.
foreach ( $revision_ids as $revision_id ) foreach ( $revision_ids as $revision_id )
wp_delete_post_revision( $revision_id ); wp_delete_post_revision( $revision_id );
@ -2482,7 +2482,7 @@ function wp_insert_post($postarr, $wp_error = false) {
if ( 'pending' == $post_status && !current_user_can( 'publish_posts' ) ) if ( 'pending' == $post_status && !current_user_can( 'publish_posts' ) )
$post_name = ''; $post_name = '';
// Create a valid post name. Drafts and pending posts are allowed to have an empty // Create a valid post name. Drafts and pending posts are allowed to have an empty
// post name. // post name.
if ( empty($post_name) ) { if ( empty($post_name) ) {
if ( !in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) if ( !in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) )
@ -4150,8 +4150,8 @@ function get_private_posts_cap_sql( $post_type ) {
* *
* @since 3.0.0 * @since 3.0.0
* @param string $post_type Post type. * @param string $post_type Post type.
* @param bool $full Optional. Returns a full WHERE statement instead of just an 'andalso' term. * @param bool $full Optional. Returns a full WHERE statement instead of just an 'andalso' term.
* @param int $post_author Optional. Query posts having a single author ID. * @param int $post_author Optional. Query posts having a single author ID.
* @return string SQL WHERE code that can be added to a query. * @return string SQL WHERE code that can be added to a query.
*/ */
function get_posts_by_author_sql( $post_type, $full = true, $post_author = null ) { function get_posts_by_author_sql( $post_type, $full = true, $post_author = null ) {
@ -4902,7 +4902,7 @@ function _wp_put_post_revision( $post = null, $autosave = false ) {
* *
* @param int|object $post Post ID or post object * @param int|object $post Post ID or post object
* @param string $output Optional. OBJECT, ARRAY_A, or ARRAY_N. * @param string $output Optional. OBJECT, ARRAY_A, or ARRAY_N.
* @param string $filter Optional sanitation filter. @see sanitize_post() * @param string $filter Optional sanitation filter. @see sanitize_post()
* @return mixed Null if error or post object if success * @return mixed Null if error or post object if success
*/ */
function &wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') { function &wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
@ -5110,7 +5110,7 @@ function wp_check_post_hierarchy_for_loops( $post_parent, $post_ID ) {
if ( isset( $loop[$post_ID] ) ) if ( isset( $loop[$post_ID] ) )
return 0; return 0;
// There's a loop, but it doesn't contain $post_ID. Break the loop. // There's a loop, but it doesn't contain $post_ID. Break the loop.
foreach ( array_keys( $loop ) as $loop_member ) foreach ( array_keys( $loop ) as $loop_member )
wp_update_post( array( 'ID' => $loop_member, 'post_parent' => 0 ) ); wp_update_post( array( 'ID' => $loop_member, 'post_parent' => 0 ) );

24
wp-includes/query.php
View File

@ -29,7 +29,7 @@ function get_query_var($var) {
/** /**
* Retrieve the currently-queried object. Wrapper for $wp_query->get_queried_object() * Retrieve the currently-queried object. Wrapper for $wp_query->get_queried_object()
* *
* @uses WP_Query::get_queried_object * @uses WP_Query::get_queried_object
* *
@ -728,7 +728,7 @@ function is_main_query() {
} }
/* /*
* The Loop. Post loop control. * The Loop. Post loop control.
*/ */
/** /**
@ -1261,7 +1261,7 @@ class WP_Query {
var $query_vars_hash = false; var $query_vars_hash = false;
/** /**
* Whether query vars have changed since the initial parse_query() call. Used to catch modifications to query vars made * Whether query vars have changed since the initial parse_query() call. Used to catch modifications to query vars made
* via pre_get_posts hooks. * via pre_get_posts hooks.
* *
* @since 3.1.1 * @since 3.1.1
@ -1454,7 +1454,7 @@ class WP_Query {
if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']); if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']);
if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']); if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']);
// Compat. Map subpost to attachment. // Compat. Map subpost to attachment.
if ( '' != $qv['subpost'] ) if ( '' != $qv['subpost'] )
$qv['attachment'] = $qv['subpost']; $qv['attachment'] = $qv['subpost'];
if ( '' != $qv['subpost_id'] ) if ( '' != $qv['subpost_id'] )
@ -1477,7 +1477,7 @@ class WP_Query {
$this->is_page = true; $this->is_page = true;
$this->is_single = false; $this->is_single = false;
} else { } else {
// Look for archive queries. Dates, categories, authors, search, post type archives. // Look for archive queries. Dates, categories, authors, search, post type archives.
if ( !empty($qv['s']) ) { if ( !empty($qv['s']) ) {
$this->is_search = true; $this->is_search = true;
@ -2449,13 +2449,13 @@ class WP_Query {
} }
if ( !empty($r_status) ) { if ( !empty($r_status) ) {
if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) ) if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) )
$statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $r_status ) . "))"; $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $r_status ) . "))";
else else
$statuswheres[] = "(" . join( ' OR ', $r_status ) . ")"; $statuswheres[] = "(" . join( ' OR ', $r_status ) . ")";
} }
if ( !empty($p_status) ) { if ( !empty($p_status) ) {
if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can($read_private_cap) ) if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can($read_private_cap) )
$statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $p_status ) . "))"; $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $p_status ) . "))";
else else
$statuswheres[] = "(" . join( ' OR ', $p_status ) . ")"; $statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
} }
@ -2564,7 +2564,7 @@ class WP_Query {
$pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' ); $pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
// Apply post-paging filters on where and join. Only plugins that // Apply post-paging filters on where and join. Only plugins that
// manipulate paging queries should use these hooks. // manipulate paging queries should use these hooks.
if ( !$q['suppress_filters'] ) { if ( !$q['suppress_filters'] ) {
$where = apply_filters_ref_array( 'posts_where_paged', array( $where, &$this ) ); $where = apply_filters_ref_array( 'posts_where_paged', array( $where, &$this ) );
@ -2581,10 +2581,10 @@ class WP_Query {
$$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : ''; $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
} }
// Announce current selection parameters. For use by caching plugins. // Announce current selection parameters. For use by caching plugins.
do_action( 'posts_selection', $where . $groupby . $orderby . $limits . $join ); do_action( 'posts_selection', $where . $groupby . $orderby . $limits . $join );
// Filter again for the benefit of caching plugins. Regular plugins should use the hooks above. // Filter again for the benefit of caching plugins. Regular plugins should use the hooks above.
if ( !$q['suppress_filters'] ) { if ( !$q['suppress_filters'] ) {
$where = apply_filters_ref_array( 'posts_where_request', array( $where, &$this ) ); $where = apply_filters_ref_array( 'posts_where_request', array( $where, &$this ) );
$groupby = apply_filters_ref_array( 'posts_groupby_request', array( $groupby, &$this ) ); $groupby = apply_filters_ref_array( 'posts_groupby_request', array( $groupby, &$this ) );
@ -2631,7 +2631,7 @@ class WP_Query {
$this->posts = $wpdb->get_results($this->request); $this->posts = $wpdb->get_results($this->request);
// Raw results filter. Prior to status checks. // Raw results filter. Prior to status checks.
if ( !$q['suppress_filters'] ) if ( !$q['suppress_filters'] )
$this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) ); $this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) );
@ -2700,7 +2700,7 @@ class WP_Query {
array_splice($this->posts, $i, 1); array_splice($this->posts, $i, 1);
// Move to front, after other stickies // Move to front, after other stickies
array_splice($this->posts, $sticky_offset, 0, array($sticky_post)); array_splice($this->posts, $sticky_offset, 0, array($sticky_post));
// Increment the sticky offset. The next sticky will be placed at this offset. // Increment the sticky offset. The next sticky will be placed at this offset.
$sticky_offset++; $sticky_offset++;
// Remove post from sticky posts array // Remove post from sticky posts array
$offset = array_search($sticky_post->ID, $sticky_posts); $offset = array_search($sticky_post->ID, $sticky_posts);

4
wp-includes/rewrite.php
View File

@ -1189,11 +1189,11 @@ class WP_Rewrite {
$feedregex2 = ''; $feedregex2 = '';
foreach ( (array) $this->feeds as $feed_name) foreach ( (array) $this->feeds as $feed_name)
$feedregex2 .= $feed_name . '|'; $feedregex2 .= $feed_name . '|';
$feedregex2 = '(' . trim($feedregex2, '|') . ')/?$'; $feedregex2 = '(' . trim($feedregex2, '|') . ')/?$';
//$feedregex is identical but with /feed/ added on as well, so URLs like <permalink>/feed/atom //$feedregex is identical but with /feed/ added on as well, so URLs like <permalink>/feed/atom
//and <permalink>/atom are both possible //and <permalink>/atom are both possible
$feedregex = $this->feed_base . '/' . $feedregex2; $feedregex = $this->feed_base . '/' . $feedregex2;
//build a regex to match the trackback and page/xx parts of URLs //build a regex to match the trackback and page/xx parts of URLs
$trackbackregex = 'trackback/?$'; $trackbackregex = 'trackback/?$';

2
wp-includes/rss-functions.php
View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Deprecated. Use rss.php instead. * Deprecated. Use rss.php instead.
* *
* @package WordPress * @package WordPress
*/ */

26
wp-includes/taxonomy.php
View File

@ -1083,19 +1083,19 @@ function get_term_to_edit( $id, $taxonomy ) {
* hide_empty - Default is true. Will not return empty terms, which means * hide_empty - Default is true. Will not return empty terms, which means
* terms whose count is 0 according to the given taxonomy. * terms whose count is 0 according to the given taxonomy.
* *
* exclude - Default is an empty array. An array, comma- or space-delimited string * exclude - Default is an empty array. An array, comma- or space-delimited string
* of term ids to exclude from the return array. If 'include' is non-empty, * of term ids to exclude from the return array. If 'include' is non-empty,
* 'exclude' is ignored. * 'exclude' is ignored.
* *
* exclude_tree - Default is an empty array. An array, comma- or space-delimited * exclude_tree - Default is an empty array. An array, comma- or space-delimited
* string of term ids to exclude from the return array, along with all of their * string of term ids to exclude from the return array, along with all of their
* descendant terms according to the primary taxonomy. If 'include' is non-empty, * descendant terms according to the primary taxonomy. If 'include' is non-empty,
* 'exclude_tree' is ignored. * 'exclude_tree' is ignored.
* *
* include - Default is an empty array. An array, comma- or space-delimited string * include - Default is an empty array. An array, comma- or space-delimited string
* of term ids to include in the return array. * of term ids to include in the return array.
* *
* number - The maximum number of terms to return. Default is to return them all. * number - The maximum number of terms to return. Default is to return them all.
* *
* offset - The number by which to offset the terms query. * offset - The number by which to offset the terms query.
* *
@ -1109,7 +1109,7 @@ function get_term_to_edit( $id, $taxonomy ) {
* (even if 'hide_empty' is set to true). * (even if 'hide_empty' is set to true).
* *
* search - Returned terms' names will contain the value of 'search', * search - Returned terms' names will contain the value of 'search',
* case-insensitive. Default is an empty string. * case-insensitive. Default is an empty string.
* *
* name__like - Returned terms' names will begin with the value of 'name__like', * name__like - Returned terms' names will begin with the value of 'name__like',
* case-insensitive. Default is empty string. * case-insensitive. Default is empty string.
@ -1120,13 +1120,13 @@ function get_term_to_edit( $id, $taxonomy ) {
* The 'get' argument, if set to 'all' instead of its default empty string, * The 'get' argument, if set to 'all' instead of its default empty string,
* returns terms regardless of ancestry or whether the terms are empty. * returns terms regardless of ancestry or whether the terms are empty.
* *
* The 'child_of' argument, when used, should be set to the integer of a term ID. Its default * The 'child_of' argument, when used, should be set to the integer of a term ID. Its default
* is 0. If set to a non-zero value, all returned terms will be descendants * is 0. If set to a non-zero value, all returned terms will be descendants
* of that term according to the given taxonomy. Hence 'child_of' is set to 0 * of that term according to the given taxonomy. Hence 'child_of' is set to 0
* if more than one taxonomy is passed in $taxonomies, because multiple taxonomies * if more than one taxonomy is passed in $taxonomies, because multiple taxonomies
* make term ancestry ambiguous. * make term ancestry ambiguous.
* *
* The 'parent' argument, when used, should be set to the integer of a term ID. Its default is * The 'parent' argument, when used, should be set to the integer of a term ID. Its default is
* the empty string '', which has a different meaning from the integer 0. * the empty string '', which has a different meaning from the integer 0.
* If set to an integer value, all returned terms will have as an immediate * If set to an integer value, all returned terms will have as an immediate
* ancestor the term whose ID is specified by that integer according to the given taxonomy. * ancestor the term whose ID is specified by that integer according to the given taxonomy.
@ -3094,7 +3094,7 @@ function get_post_taxonomies($post = 0) {
* *
* @param int $object_id ID of the object (post ID, link ID, ...) * @param int $object_id ID of the object (post ID, link ID, ...)
* @param string $taxonomy Single taxonomy name * @param string $taxonomy Single taxonomy name
* @param int|string|array $terms Optional. Term term_id, name, slug or array of said * @param int|string|array $terms Optional. Term term_id, name, slug or array of said
* @return bool|WP_Error. WP_Error on input error. * @return bool|WP_Error. WP_Error on input error.
*/ */
function is_object_in_term( $object_id, $taxonomy, $terms = null ) { function is_object_in_term( $object_id, $taxonomy, $terms = null ) {
@ -3240,7 +3240,7 @@ function wp_check_term_hierarchy_for_loops( $parent, $term_id, $taxonomy ) {
if ( isset( $loop[$term_id] ) ) if ( isset( $loop[$term_id] ) )
return 0; return 0;
// There's a loop, but it doesn't contain $term_id. Break the loop. // There's a loop, but it doesn't contain $term_id. Break the loop.
foreach ( array_keys( $loop ) as $loop_member ) foreach ( array_keys( $loop ) as $loop_member )
wp_update_term( $loop_member, $taxonomy, array( 'parent' => 0 ) ); wp_update_term( $loop_member, $taxonomy, array( 'parent' => 0 ) );

8
wp-includes/theme.php
View File

@ -393,9 +393,9 @@ function get_themes() {
if ( empty($stylesheet_dir) ) if ( empty($stylesheet_dir) )
$stylesheet_dir = '/'; $stylesheet_dir = '/';
// Check for theme name collision. This occurs if a theme is copied to // Check for theme name collision. This occurs if a theme is copied to
// a new theme directory and the theme header is not updated. Whichever // a new theme directory and the theme header is not updated. Whichever
// theme is first keeps the name. Subsequent themes get a suffix applied. // theme is first keeps the name. Subsequent themes get a suffix applied.
// The Twenty Eleven, Twenty Ten, Default and Classic themes always trump // The Twenty Eleven, Twenty Ten, Default and Classic themes always trump
// their pretenders. // their pretenders.
if ( isset($wp_themes[$name]) ) { if ( isset($wp_themes[$name]) ) {
@ -1942,7 +1942,7 @@ function current_theme_supports( $feature ) {
switch ( $feature ) { switch ( $feature ) {
case 'post-thumbnails': case 'post-thumbnails':
// post-thumbnails can be registered for only certain content/post types by passing // post-thumbnails can be registered for only certain content/post types by passing
// an array of types to add_theme_support(). If no array was passed, then // an array of types to add_theme_support(). If no array was passed, then
// any type is accepted // any type is accepted
if ( true === $_wp_theme_features[$feature] ) // Registered for all types if ( true === $_wp_theme_features[$feature] ) // Registered for all types
return true; return true;

4
wp-includes/user.php
View File

@ -828,7 +828,7 @@ function update_user_meta($user_id, $meta_key, $meta_value, $prev_value = '') {
* Count number of users who have each of the user roles. * Count number of users who have each of the user roles.
* *
* Assumes there are neither duplicated nor orphaned capabilities meta_values. * Assumes there are neither duplicated nor orphaned capabilities meta_values.
* Assumes role names are unique phrases. Same assumption made by WP_User_Query::prepare_query() * Assumes role names are unique phrases. Same assumption made by WP_User_Query::prepare_query()
* Using $strategy = 'time' this is CPU-intensive and should handle around 10^7 users. * Using $strategy = 'time' this is CPU-intensive and should handle around 10^7 users.
* Using $strategy = 'memory' this is memory-intensive and should handle around 10^5 users, but see WP Bug #12257. * Using $strategy = 'memory' this is memory-intensive and should handle around 10^5 users, but see WP Bug #12257.
* *
@ -973,7 +973,7 @@ function setup_userdata($for_user_id = '') {
* <li>id - Default is the value of the 'name' parameter. ID attribute of select element.</li> * <li>id - Default is the value of the 'name' parameter. ID attribute of select element.</li>
* <li>class - Class attribute of select element.</li> * <li>class - Class attribute of select element.</li>
* <li>blog_id - ID of blog (Multisite only). Defaults to ID of current blog.</li> * <li>blog_id - ID of blog (Multisite only). Defaults to ID of current blog.</li>
* <li>who - Which users to query. Currently only 'authors' is supported. Default is all users.</li> * <li>who - Which users to query. Currently only 'authors' is supported. Default is all users.</li>
* </ol> * </ol>
* *
* @since 2.3.0 * @since 2.3.0

10
wp-includes/wp-db.php
View File

@ -1191,7 +1191,7 @@ class wpdb {
* @see wp_set_wpdb_vars() * @see wp_set_wpdb_vars()
* *
* @param string $table table name * @param string $table table name
* @param array $data Data to insert (in column => value pairs). Both $data columns and $data values should be "raw" (neither should be SQL escaped). * @param array $data Data to insert (in column => value pairs). Both $data columns and $data values should be "raw" (neither should be SQL escaped).
* @param array|string $format Optional. An array of formats to be mapped to each of the value in $data. If string, that format will be used for all of the values in $data. * @param array|string $format Optional. An array of formats to be mapped to each of the value in $data. If string, that format will be used for all of the values in $data.
* A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types. * A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types.
* @param string $type Optional. What type of operation is this? INSERT or REPLACE. Defaults to INSERT. * @param string $type Optional. What type of operation is this? INSERT or REPLACE. Defaults to INSERT.
@ -1234,7 +1234,7 @@ class wpdb {
* @param array $where A named array of WHERE clauses (in column => value pairs). Multiple clauses will be joined with ANDs. Both $where columns and $where values should be "raw". * @param array $where A named array of WHERE clauses (in column => value pairs). Multiple clauses will be joined with ANDs. Both $where columns and $where values should be "raw".
* @param array|string $format Optional. An array of formats to be mapped to each of the values in $data. If string, that format will be used for all of the values in $data. * @param array|string $format Optional. An array of formats to be mapped to each of the values in $data. If string, that format will be used for all of the values in $data.
* A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types. * A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types.
* @param array|string $where_format Optional. An array of formats to be mapped to each of the values in $where. If string, that format will be used for all of the items in $where. A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $where will be treated as strings. * @param array|string $where_format Optional. An array of formats to be mapped to each of the values in $where. If string, that format will be used for all of the items in $where. A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $where will be treated as strings.
* @return int|false The number of rows updated, or false on error. * @return int|false The number of rows updated, or false on error.
*/ */
function update( $table, $data, $where, $format = null, $where_format = null ) { function update( $table, $data, $where, $format = null, $where_format = null ) {
@ -1278,8 +1278,8 @@ class wpdb {
* @since 0.71 * @since 0.71
* *
* @param string|null $query Optional. SQL query. Defaults to null, use the result from the previous query. * @param string|null $query Optional. SQL query. Defaults to null, use the result from the previous query.
* @param int $x Optional. Column of value to return. Indexed from 0. * @param int $x Optional. Column of value to return. Indexed from 0.
* @param int $y Optional. Row of value to return. Indexed from 0. * @param int $y Optional. Row of value to return. Indexed from 0.
* @return string|null Database query result (as string), or null on failure * @return string|null Database query result (as string), or null on failure
*/ */
function get_var( $query = null, $x = 0, $y = 0 ) { function get_var( $query = null, $x = 0, $y = 0 ) {
@ -1365,7 +1365,7 @@ class wpdb {
* @param string $query SQL query. * @param string $query SQL query.
* @param string $output Optional. Any of ARRAY_A | ARRAY_N | OBJECT | OBJECT_K constants. With one of the first three, return an array of rows indexed from 0 by SQL result row number. * @param string $output Optional. Any of ARRAY_A | ARRAY_N | OBJECT | OBJECT_K constants. With one of the first three, return an array of rows indexed from 0 by SQL result row number.
* Each row is an associative array (column => value, ...), a numerically indexed array (0 => value, ...), or an object. ( ->column = value ), respectively. * Each row is an associative array (column => value, ...), a numerically indexed array (0 => value, ...), or an object. ( ->column = value ), respectively.
* With OBJECT_K, return an associative array of row objects keyed by the value of each row's first column's value. Duplicate keys are discarded. * With OBJECT_K, return an associative array of row objects keyed by the value of each row's first column's value. Duplicate keys are discarded.
* @return mixed Database query results * @return mixed Database query results
*/ */
function get_results( $query = null, $output = OBJECT ) { function get_results( $query = null, $output = OBJECT ) {

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

@ -202,9 +202,9 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
$r = ''; $r = '';
// Does the aforementioned additional processing // Does the aforementioned additional processing
// *_matches tell what rows are "the same" in orig and final. Those pairs will be diffed to get word changes // *_matches tell what rows are "the same" in orig and final. Those pairs will be diffed to get word changes
// match is numeric: an index in other column // match is numeric: an index in other column
// match is 'X': no match. It is a new row // match is 'X': no match. It is a new row
// *_rows are column vectors for the orig column and the final column. // *_rows are column vectors for the orig column and the final column.
// row >= 0: an indix of the $orig or $final array // row >= 0: an indix of the $orig or $final array
// row < 0: a blank row for that column // row < 0: a blank row for that column
@ -231,7 +231,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
$stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches; $stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches;
$diff_ratio = $stripped_matches / $stripped_diff; $diff_ratio = $stripped_matches / $stripped_diff;
if ( $diff_ratio > $this->_diff_threshold ) if ( $diff_ratio > $this->_diff_threshold )
continue; // Too different. Don't save diffs. continue; // Too different. Don't save diffs.
} }
// Un-inline the diffs by removing del or ins // Un-inline the diffs by removing del or ins
@ -241,11 +241,11 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
} }
foreach ( array_keys($orig_rows) as $row ) { foreach ( array_keys($orig_rows) as $row ) {
// Both columns have blanks. Ignore them. // Both columns have blanks. Ignore them.
if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 ) if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 )
continue; continue;
// If we have a word based diff, use it. Otherwise, use the normal line. // If we have a word based diff, use it. Otherwise, use the normal line.
if ( isset( $orig_diffs[$orig_rows[$row]] ) ) if ( isset( $orig_diffs[$orig_rows[$row]] ) )
$orig_line = $orig_diffs[$orig_rows[$row]]; $orig_line = $orig_diffs[$orig_rows[$row]];
elseif ( isset( $orig[$orig_rows[$row]] ) ) elseif ( isset( $orig[$orig_rows[$row]] ) )
@ -260,9 +260,9 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
else else
$final_line = ''; $final_line = '';
if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row. if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row.
$r .= $this->_added( array($final_line), false ); $r .= $this->_added( array($final_line), false );
} elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row. } elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row.
$r .= $this->_deleted( array($orig_line), false ); $r .= $this->_deleted( array($orig_line), false );
} else { // A true changed row. } else { // A true changed row.
$r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->addedLine( $final_line ) . "</tr>\n"; $r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->addedLine( $final_line ) . "</tr>\n";
@ -288,7 +288,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
*/ */
function interleave_changed_lines( $orig, $final ) { function interleave_changed_lines( $orig, $final ) {
// Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array. // Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array.
$matches = array(); $matches = array();
foreach ( array_keys($orig) as $o ) { foreach ( array_keys($orig) as $o ) {
foreach ( array_keys($final) as $f ) { foreach ( array_keys($final) as $f ) {
@ -309,7 +309,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
if ( isset($orig_matches[$o]) && isset($final_matches[$f]) ) if ( isset($orig_matches[$o]) && isset($final_matches[$f]) )
continue; continue;
// First match for these guys. Must be best match // First match for these guys. Must be best match
if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) { if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) {
$orig_matches[$o] = $f; $orig_matches[$o] = $f;
$final_matches[$f] = $o; $final_matches[$f] = $o;
@ -342,11 +342,11 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
if ( false === $final_pos ) { // This orig is paired with a blank final. if ( false === $final_pos ) { // This orig is paired with a blank final.
array_splice( $final_rows, $orig_pos, 0, -1 ); array_splice( $final_rows, $orig_pos, 0, -1 );
} elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows. } elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows.
$diff_pos = $final_pos - $orig_pos; $diff_pos = $final_pos - $orig_pos;
while ( $diff_pos < 0 ) while ( $diff_pos < 0 )
array_splice( $final_rows, $orig_pos, 0, $diff_pos++ ); array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
} elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows. } elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows.
$diff_pos = $orig_pos - $final_pos; $diff_pos = $orig_pos - $final_pos;
while ( $diff_pos < 0 ) while ( $diff_pos < 0 )
array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ ); array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
@ -427,7 +427,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
// L1-norm of difference vector. // L1-norm of difference vector.
$difference = array_sum( array_map( array(&$this, 'difference'), $chars1, $chars2 ) ); $difference = array_sum( array_map( array(&$this, 'difference'), $chars1, $chars2 ) );
// $string1 has zero length? Odd. Give huge penalty by not dividing. // $string1 has zero length? Odd. Give huge penalty by not dividing.
if ( !$string1 ) if ( !$string1 )
return $difference; return $difference;

2
wp-login.php
View File

@ -560,7 +560,7 @@ default:
$reauth = empty($_REQUEST['reauth']) ? false : true; $reauth = empty($_REQUEST['reauth']) ? false : true;
// If the user was redirected to a secure login form from a non-secure admin page, and secure login is required but secure admin is not, then don't use a secure // If the user was redirected to a secure login form from a non-secure admin page, and secure login is required but secure admin is not, then don't use a secure
// cookie and redirect back to the referring non-secure admin page. This allows logins to always be POSTed over SSL while allowing the user to choose visiting // cookie and redirect back to the referring non-secure admin page. This allows logins to always be POSTed over SSL while allowing the user to choose visiting
// the admin via http or https. // the admin via http or https.
if ( !$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) ) if ( !$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) )
$secure_cookie = false; $secure_cookie = false;

4
wp-mail.php
View File

@ -161,7 +161,7 @@ for ( $i = 1; $i <= $count; $i++ ) {
$user = new WP_User($post_author); $user = new WP_User($post_author);
$post_status = ( $user->has_cap('publish_posts') ) ? 'publish' : 'pending'; $post_status = ( $user->has_cap('publish_posts') ) ? 'publish' : 'pending';
} else { } else {
// Author not found in DB, set status to pending. Author already set to admin. // Author not found in DB, set status to pending. Author already set to admin.
$post_status = 'pending'; $post_status = 'pending';
} }
@ -226,7 +226,7 @@ for ( $i = 1; $i <= $count; $i++ ) {
$pop3->reset(); $pop3->reset();
exit; exit;
} else { } else {
echo '<p>' . sprintf(__('Mission complete. Message <strong>%s</strong> deleted.'), $i) . '</p>'; echo '<p>' . sprintf(__('Mission complete. Message <strong>%s</strong> deleted.'), $i) . '</p>';
} }
} }

2
wp-signup.php
View File

@ -218,7 +218,7 @@ function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $u
?> ?>
<h2><?php printf( __( 'The site %s is yours.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2> <h2><?php printf( __( 'The site %s is yours.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
<p> <p>
<?php printf( __( '<a href="http://%1$s">http://%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?> <?php printf( __( '<a href="http://%1$s">http://%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?>
</p> </p>
<?php <?php
do_action( 'signup_finished' ); do_action( 'signup_finished' );