Index: wp-signup.php =================================================================== --- wp-signup.php (revision 22283) +++ wp-signup.php (working copy) @@ -382,7 +382,7 @@ $i18n_signup['user'] = _x('user', 'Multisite active signup type'); if ( is_super_admin() ) - echo '
' . sprintf( __( 'Greetings Site Administrator! You are currently allowing “%s” registrations. To change or disable registration go to your Options page.' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'settings.php' ) ) ) . '
'; + echo '
' . sprintf( __( 'Greetings Site Administrator! You are currently allowing “%1$s” registrations. To change or disable registration go to your Options page.' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'settings.php' ) ) ) . '
'; $newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null; Index: wp-includes/class-phpmailer.php =================================================================== --- wp-includes/class-phpmailer.php (revision 22283) +++ wp-includes/class-phpmailer.php (working copy) @@ -638,7 +638,7 @@ $this->MIMEHeader = str_replace("\r\n", "\n", $header_dkim) . $this->MIMEHeader; } - $this->SentMIMEMessage = sprintf("%s%s\r\n\r\n%s",$this->MIMEHeader,$mailHeader,$this->MIMEBody); + $this->SentMIMEMessage = sprintf("%1$s%2$s\r\n\r\n%3$s",$this->MIMEHeader,$mailHeader,$this->MIMEBody); return true; } catch (phpmailerException $e) { @@ -685,7 +685,7 @@ */ protected function SendmailSend($header, $body) { if ($this->Sender != '') { - $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender)); + $sendmail = sprintf("%1$s -oi -f %2$s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender)); } else { $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail)); } @@ -1224,7 +1224,7 @@ if($this->MessageID != '') { $result .= $this->HeaderLine('Message-ID', $this->MessageID); } else { - $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE); + $result .= sprintf("Message-ID: <%1$s@%2$s>%3$s", $uniq_id, $this->ServerHostname(), $this->LE); } $result .= $this->HeaderLine('X-Priority', $this->Priority); if($this->XMailer) { @@ -1444,7 +1444,7 @@ $encoding = $this->Encoding; } $result .= $this->TextLine('--' . $boundary); - $result .= sprintf("Content-Type: %s; charset=\"%s\"", $contentType, $charSet); + $result .= sprintf("Content-Type: %1$s; charset=\"%2$s\"", $contentType, $charSet); $result .= $this->LE; $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding); $result .= $this->LE; @@ -1587,15 +1587,15 @@ if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; } $cidUniq[$cid] = true; - $mime[] = sprintf("--%s%s", $boundary, $this->LE); - $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE); - $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE); + $mime[] = sprintf("--%1$s%2$s", $boundary, $this->LE); + $mime[] = sprintf("Content-Type: %s; name=\"%1$s\"%2$s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE); + $mime[] = sprintf("Content-Transfer-Encoding: %1$s%2$s", $encoding, $this->LE); if($disposition == 'inline') { - $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE); + $mime[] = sprintf("Content-ID: <%1$s>%2$s", $cid, $this->LE); } - $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE); + $mime[] = sprintf("Content-Disposition: %1$s; filename=\"%2$s\"%3$s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE); // Encode as string attachment if($bString) { @@ -1614,7 +1614,7 @@ } } - $mime[] = sprintf("--%s--%s", $boundary, $this->LE); + $mime[] = sprintf("--%1$s--%2$s", $boundary, $this->LE); return implode("", $mime); } @@ -2135,7 +2135,7 @@ $tzs = ($tz < 0) ? '-' : '+'; $tz = abs($tz); $tz = (int)($tz/3600)*100 + ($tz%3600)/60; - $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz); + $result = sprintf("%1$s %2$s%04d", date('D, j M Y H:i:s'), $tzs, $tz); return $result; } Index: wp-includes/class-wp-customize-control.php =================================================================== --- wp-includes/class-wp-customize-control.php (revision 22283) +++ wp-includes/class-wp-customize-control.php (working copy) @@ -299,7 +299,7 @@ $dropdown = str_replace( 'get_link(), $dropdown ); printf( - '', + '', $this->label, $dropdown ); Index: wp-admin/edit-comments.php =================================================================== --- wp-admin/edit-comments.php (revision 22283) +++ wp-admin/edit-comments.php (working copy) @@ -144,7 +144,7 @@

%s', + sprintf('%2$s', get_edit_post_link($post_id), wp_html_excerpt(_draft_or_post_title($post_id), 50) ) Index: wp-admin/includes/ajax-actions.php =================================================================== --- wp-admin/includes/ajax-actions.php (revision 22283) +++ wp-admin/includes/ajax-actions.php (working copy) @@ -924,7 +924,7 @@ $_POST['post_type'] = $post->post_type; $_POST['post_status'] = 'draft'; $now = current_time('timestamp', 1); - $_POST['post_title'] = sprintf('Draft created on %s at %s', date(get_option('date_format'), $now), date(get_option('time_format'), $now)); + $_POST['post_title'] = sprintf('Draft created on %1$s at %2$s', date(get_option('date_format'), $now), date(get_option('time_format'), $now)); if ( $pid = edit_post() ) { if ( is_wp_error( $pid ) ) { @@ -1016,7 +1016,7 @@ 'id' => $user_id, 'data' => $wp_list_table->single_row( $user_object, '', $role ), 'supplemental' => array( - 'show-link' => sprintf(__( 'User %s added' ), "user-$user_id", $user_object->user_login), + 'show-link' => sprintf(__( 'User %2$s added' ), "user-$user_id", $user_object->user_login), 'role' => $role, ) ) ); Index: wp-admin/includes/class-wp-list-table.php =================================================================== --- wp-admin/includes/class-wp-list-table.php (revision 22283) +++ wp-admin/includes/class-wp-list-table.php (working copy) @@ -384,7 +384,7 @@ $month = zeroise( $arc_row->month, 2 ); $year = $arc_row->year; - printf( "\n", + printf( "\n", selected( $m, $year . $month, false ), esc_attr( $arc_row->year . $month ), /* translators: 1: month name, 2: 4-digit year */ @@ -503,14 +503,14 @@ if ( $current == $total_pages ) $disable_last = ' disabled'; - $page_links[] = sprintf( "%s", + $page_links[] = sprintf( "%4$s", 'first-page' . $disable_first, esc_attr__( 'Go to the first page' ), esc_url( remove_query_arg( 'paged', $current_url ) ), '«' ); - $page_links[] = sprintf( "%s", + $page_links[] = sprintf( "%4$s", 'prev-page' . $disable_first, esc_attr__( 'Go to the previous page' ), esc_url( add_query_arg( 'paged', max( 1, $current-1 ), $current_url ) ), @@ -520,7 +520,7 @@ if ( 'bottom' == $which ) $html_current_page = $current; else - $html_current_page = sprintf( "", + $html_current_page = sprintf( "", esc_attr__( 'Current page' ), $current, strlen( $total_pages ) @@ -529,14 +529,14 @@ $html_total_pages = sprintf( "%s", number_format_i18n( $total_pages ) ); $page_links[] = '' . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . ''; - $page_links[] = sprintf( "%s", + $page_links[] = sprintf( "%4$s", 'next-page' . $disable_last, esc_attr__( 'Go to the next page' ), esc_url( add_query_arg( 'paged', min( $total_pages, $current+1 ), $current_url ) ), '›' ); - $page_links[] = sprintf( "%s", + $page_links[] = sprintf( "%4$s", 'last-page' . $disable_last, esc_attr__( 'Go to the last page' ), esc_url( add_query_arg( 'paged', $total_pages, $current_url ) ), Index: wp-admin/includes/class-wp-ms-themes-list-table.php =================================================================== --- wp-admin/includes/class-wp-ms-themes-list-table.php (revision 22283) +++ wp-admin/includes/class-wp-ms-themes-list-table.php (working copy) @@ -214,7 +214,7 @@ $url = 'themes.php'; if ( 'search' != $type ) { - $status_links[$type] = sprintf( "%s", + $status_links[$type] = sprintf( "%3$s", esc_url( add_query_arg('theme_status', $type, $url) ), ( $type == $status ) ? ' class="current"' : '', sprintf( $text, number_format_i18n( $count ) ) Index: wp-admin/includes/deprecated.php =================================================================== --- wp-admin/includes/deprecated.php (revision 22283) +++ wp-admin/includes/deprecated.php (working copy) @@ -578,7 +578,7 @@ 'add_args' => $args ) ); if ( $this->paging_text ) { - $this->paging_text = sprintf( '' . __( 'Displaying %s–%s of %s' ) . '%s', + $this->paging_text = sprintf( '' . __( 'Displaying %1$s–%2$s of %3$s' ) . '%4$s', number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ), number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ), number_format_i18n( $this->total_users_for_query ), Index: wp-admin/includes/class-wp-plugins-list-table.php =================================================================== --- wp-admin/includes/class-wp-plugins-list-table.php (revision 22283) +++ wp-admin/includes/class-wp-plugins-list-table.php (working copy) @@ -220,7 +220,7 @@ } if ( 'search' != $type ) { - $status_links[$type] = sprintf( "%s", + $status_links[$type] = sprintf( "%3$s", add_query_arg('plugin_status', $type, 'plugins.php'), ( $type == $status ) ? ' class="current"' : '', sprintf( $text, number_format_i18n( $count ) ) Index: wp-admin/includes/class-wp-filesystem-ftpext.php =================================================================== --- wp-admin/includes/class-wp-filesystem-ftpext.php (revision 22283) +++ wp-admin/includes/class-wp-filesystem-ftpext.php (working copy) @@ -165,7 +165,7 @@ // chmod the file or directory if ( ! function_exists('ftp_chmod') ) - return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file)); + return (bool)@ftp_site($this->link, sprintf('CHMOD %1$o %2$s', $mode, $file)); return (bool)@ftp_chmod($this->link, $mode, $file); } function chown($file, $owner, $recursive = false ) { Index: wp-admin/includes/class-wp-filesystem-ssh2.php =================================================================== --- wp-admin/includes/class-wp-filesystem-ssh2.php (revision 22283) +++ wp-admin/includes/class-wp-filesystem-ssh2.php (working copy) @@ -184,8 +184,8 @@ if ( ! $this->exists($file) ) return false; if ( ! $recursive || ! $this->is_dir($file) ) - return $this->run_command(sprintf('chgrp %o %s', $mode, escapeshellarg($file)), true); - return $this->run_command(sprintf('chgrp -R %o %s', $mode, escapeshellarg($file)), true); + return $this->run_command(sprintf('chgrp %1$o %2$s', $mode, escapeshellarg($file)), true); + return $this->run_command(sprintf('chgrp -R %1$o %2$s', $mode, escapeshellarg($file)), true); } function chmod($file, $mode = false, $recursive = false) { @@ -202,16 +202,16 @@ } if ( ! $recursive || ! $this->is_dir($file) ) - return $this->run_command(sprintf('chmod %o %s', $mode, escapeshellarg($file)), true); - return $this->run_command(sprintf('chmod -R %o %s', $mode, escapeshellarg($file)), true); + return $this->run_command(sprintf('chmod %1$o %2$s', $mode, escapeshellarg($file)), true); + return $this->run_command(sprintf('chmod -R %1$o %2$s', $mode, escapeshellarg($file)), true); } function chown($file, $owner, $recursive = false ) { if ( ! $this->exists($file) ) return false; if ( ! $recursive || ! $this->is_dir($file) ) - return $this->run_command(sprintf('chown %o %s', $mode, escapeshellarg($file)), true); - return $this->run_command(sprintf('chown -R %o %s', $mode, escapeshellarg($file)), true); + return $this->run_command(sprintf('chown %1$o %2$s', $mode, escapeshellarg($file)), true); + return $this->run_command(sprintf('chown -R %1$o %2$s', $mode, escapeshellarg($file)), true); } function owner($file) { Index: wp-admin/plugins.php =================================================================== --- wp-admin/plugins.php (revision 22283) +++ wp-admin/plugins.php (working copy) @@ -364,7 +364,7 @@ $invalid = validate_active_plugins(); if ( !empty($invalid) ) foreach ( $invalid as $plugin_file => $error ) - echo '

' . sprintf(__('The plugin %s has been deactivated due to an error: %s'), esc_html($plugin_file), $error->get_error_message()) . '

'; + echo '

' . sprintf(__('The plugin %1$s has been deactivated due to an error: %2$s'), esc_html($plugin_file), $error->get_error_message()) . '

'; ?> get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type=%s AND post_status = %s", $post_type, $post_status ) ); + $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type=%1$s AND post_status = %2$s", $post_type, $post_status ) ); $doaction = 'delete'; } elseif ( isset( $_REQUEST['media'] ) ) { $post_ids = $_REQUEST['media']; Index: wp-admin/press-this.php =================================================================== --- wp-admin/press-this.php (revision 22283) +++ wp-admin/press-this.php (working copy) @@ -608,7 +608,7 @@ if ( $selection ) $content .= __('via '); - $content .= sprintf( "%s.

", esc_url( $url ), esc_html( $title ) ); + $content .= sprintf( "%2$s.

", esc_url( $url ), esc_html( $title ) ); } remove_action( 'media_buttons', 'media_buttons' ); Index: wp-admin/update-core.php =================================================================== --- wp-admin/update-core.php (revision 22283) +++ wp-admin/update-core.php (working copy) @@ -26,7 +26,7 @@ static $first_pass = true; $version_string = ('en_US' == $update->locale && 'en_US' == get_locale() ) ? - $update->current : sprintf("%s–%s", $update->current, $update->locale); + $update->current : sprintf("%1$s–%2$s", $update->current, $update->locale); $current = false; if ( !isset($update->response) || 'latest' == $update->response ) $current = true; @@ -161,7 +161,7 @@ echo '

' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal.' ) . '

'; } else { list( $normalized_version ) = explode( '-', $wp_version ); - echo '

' . sprintf( __( 'Learn more about WordPress %s.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '

'; + echo '

' . sprintf( __( 'Learn more about WordPress %2$s.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '

'; } dismissed_updates(); }