Index: I:\000_WP_SVN\wp-core\src\xmlrpc.php =================================================================== --- I:\000_WP_SVN\wp-core\src\xmlrpc.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\xmlrpc.php (working copy) @@ -31,7 +31,7 @@ if ( isset( $_GET['rsd'] ) ) { // http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true); ?> -'; ?> +'; ?> WordPress Index: I:\000_WP_SVN\wp-core\src\wp-links-opml.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-links-opml.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-links-opml.php (working copy) @@ -22,7 +22,7 @@ $link_cat = absint( (string)urldecode($link_cat) ); } -echo '\n"; +echo '\n"; ?> Index: I:\000_WP_SVN\wp-core\src\wp-mail.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-mail.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-mail.php (working copy) @@ -119,7 +119,7 @@ $author = trim($line); $author = sanitize_email($author); if ( is_email($author) ) { - echo '

' . sprintf(__('Author is %s'), $author) . '

'; + echo '

', sprintf( __( 'Author is %s' ), $author ), '

'; $userdata = get_user_by('email', $author); if ( ! empty( $userdata ) ) { $post_author = $userdata->ID; @@ -229,7 +229,7 @@ $post_ID = wp_insert_post($post_data); if ( is_wp_error( $post_ID ) ) - echo "\n" . $post_ID->get_error_message(); + echo "\n", $post_ID->get_error_message(); // We couldn't post, for whatever reason. Better move forward to the next email. if ( empty( $post_ID ) ) @@ -244,15 +244,15 @@ */ do_action( 'publish_phone', $post_ID ); - echo "\n

" . sprintf(__('Author: %s'), esc_html($post_author)) . '

'; - echo "\n

" . sprintf(__('Posted title: %s'), esc_html($post_title)) . '

'; + echo "\n

", sprintf( __( 'Author: %s' ), esc_html( $post_author ) ), '

', + "\n

", sprintf( __( 'Posted title: %s' ), esc_html( $post_title ) ), '

'; if(!$pop3->delete($i)) { - echo '

' . sprintf(__('Oops: %s'), esc_html($pop3->ERROR)) . '

'; + echo '

', sprintf( __( 'Oops: %s'), esc_html( $pop3->ERROR ) ), '

'; $pop3->reset(); exit; } else { - echo '

' . sprintf(__('Mission complete. Message %s deleted.'), $i) . '

'; + echo '

', sprintf( __( 'Mission complete. Message %s deleted.' ), $i ), '

'; } } Index: I:\000_WP_SVN\wp-core\src\wp-activate.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-activate.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-activate.php (working copy) @@ -102,7 +102,7 @@ ?>

'.$result->get_error_message().'

'; + echo '

', $result->get_error_message(), '

'; } } else { $url = isset( $result['blog_id'] ) ? get_blogaddress_by_id( (int) $result['blog_id'] ) : ''; Index: I:\000_WP_SVN\wp-core\src\wp-trackback.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-trackback.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-trackback.php (working copy) @@ -27,17 +27,17 @@ function trackback_response($error = 0, $error_message = '') { header('Content-Type: text/xml; charset=' . get_option('blog_charset') ); if ($error) { - echo '\n"; - echo "\n"; - echo "1\n"; - echo "$error_message\n"; - echo ""; + echo '\n", + "\n", + "1\n", + '', $error_message, "\n", + ''; die(); } else { - echo '\n"; - echo "\n"; - echo "0\n"; - echo ""; + echo '\n", + "\n", + "0\n", + ''; } } Index: I:\000_WP_SVN\wp-core\src\wp-signup.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-signup.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-signup.php (working copy) @@ -91,25 +91,25 @@ $current_site = get_current_site(); // Blog name if ( !is_subdomain_install() ) - echo ''; + echo ''; else - echo ''; + echo ''; if ( $errmsg = $errors->get_error_message('blogname') ) { ?>

' . $current_site->domain . $current_site->path . '
'; + echo '', $current_site->domain, $current_site->path, '
'; else - echo '.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '
'; + echo '.', ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ), '
'; if ( !is_user_logged_in() ) { if ( !is_subdomain_install() ) $site = $current_site->domain . $current_site->path . __( 'sitename' ); else $site = __( 'domain' ) . '.' . $site_domain . $current_site->path; - echo '

(' . sprintf( __('Your address will be %s.'), $site ) . ') ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '

'; + echo '

(', sprintf( __('Your address will be %s.'), $site ), ') ', __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ), '

'; } // Blog Title @@ -118,7 +118,7 @@ get_error_message('blog_title') ) { ?>

'; + echo ''; ?>
@@ -174,11 +174,11 @@ */ function show_user_form($user_name = '', $user_email = '', $errors = '') { // User name - echo ''; + echo ''; if ( $errmsg = $errors->get_error_message('user_name') ) { - echo '

'.$errmsg.'

'; + echo '

', $errmsg, '

'; } - echo '
'; + echo '
'; _e( '(Must be at least 4 characters, letters and numbers only.)' ); ?> @@ -189,7 +189,7 @@
get_error_message('generic') ) { - echo '

' . $errmsg . '

'; + echo '

', $errmsg, '

'; } /** * Fires at the end of the user registration form on the site sign-up form. @@ -253,10 +253,10 @@ $blog_title = $filtered_results['blog_title']; $errors = $filtered_results['errors']; - echo '

' . sprintf( __( 'Get another %s site in seconds' ), get_current_site()->site_name ) . '

'; + echo '

', sprintf( __( 'Get another %s site in seconds' ), get_current_site()->site_name ), '

'; if ( $errors->get_error_code() ) { - echo '

' . __( 'There was a problem, please correct the form below and try again.' ) . '

'; + echo '

', __( 'There was a problem, please correct the form below and try again.' ), '

'; } ?>

add another site to your account. There is no limit to the number of sites you can have, so create to your heart’s content, but write responsibly!' ), $current_user->display_name ) ?>

@@ -269,7 +269,7 @@ @@ -661,7 +661,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 “%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; @@ -670,7 +670,7 @@ _e( 'Registration has been disabled.' ); } elseif ( $active_signup == 'blog' && !is_user_logged_in() ) { $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode( network_site_url( 'wp-signup.php' ) ) ); - echo sprintf( __( 'You must first log in, and then you can create a new site.' ), $login_url ); + printf( __( 'You must first log in, and then you can create a new site.' ), $login_url ); } else { $stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default'; switch ( $stage ) { Index: I:\000_WP_SVN\wp-core\src\wp-login.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-login.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-login.php (working copy) @@ -163,7 +163,7 @@ */ $message = apply_filters( 'login_message', $message ); if ( !empty( $message ) ) - echo $message . "\n"; + echo $message, "\n"; // In case a plugin uses $error rather than the $wp_errors object if ( !empty( $error ) ) { @@ -191,7 +191,7 @@ * * @param string $errors Login error message. */ - echo '
' . apply_filters( 'login_errors', $errors ) . "
\n"; + echo '
', apply_filters( 'login_errors', $errors ), "
\n"; } if ( ! empty( $messages ) ) { /** @@ -201,7 +201,7 @@ * * @param string $messages Login messages. */ - echo '

' . apply_filters( 'login_messages', $messages ) . "

\n"; + echo '

', apply_filters( 'login_messages', $messages ), "

\n"; } } } // End of login_header() @@ -574,7 +574,7 @@ $registration_url = sprintf( '%s', esc_url( wp_registration_url() ), __( 'Register' ) ); /** This filter is documented in wp-includes/general-template.php */ - echo ' | ' . apply_filters( 'register', $registration_url ); + echo ' | ', apply_filters( 'register', $registration_url ); endif; ?>

@@ -679,7 +679,7 @@ $registration_url = sprintf( '%s', esc_url( wp_registration_url() ), __( 'Register' ) ); /** This filter is documented in wp-includes/general-template.php */ - echo ' | ' . apply_filters( 'register', $registration_url ); + echo ' | ', apply_filters( 'register', $registration_url ); endif; ?>

@@ -936,7 +936,7 @@ $registration_url = sprintf( '%s', esc_url( wp_registration_url() ), __( 'Register' ) ); /** This filter is documented in wp-includes/general-template.php */ - echo apply_filters( 'register', $registration_url ) . ' | '; + echo apply_filters( 'register', $registration_url ), ' | '; endif; ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\options-reading.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\options-reading.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\options-reading.php (working copy) @@ -44,8 +44,8 @@ * @since 3.5.0 */ function options_reading_blog_charset() { - echo ''; - echo '

' . __( 'The character encoding of your site (UTF-8 is recommended)' ) . '

'; + echo '', + '

', __( 'The character encoding of your site (UTF-8 is recommended)' ), '

'; } get_current_screen()->add_help_tab( array( Index: I:\000_WP_SVN\wp-core\src\wp-admin\about.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\about.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\about.php (working copy) @@ -93,7 +93,7 @@ if ( ! current_user_can( 'manage_options' ) ) { $string = strip_tags( $string ); } - echo sprintf( $string, $display_version, $count, admin_url( 'options-general.php' ) ); + printf( $string, $display_version, $count, admin_url( 'options-general.php' ) ); ?>

@@ -117,7 +117,7 @@ if ( ! current_user_can( 'install_plugins' ) ) { $string = strip_tags( $string ); } - echo sprintf( $string, network_admin_url( 'plugin-install.php?tab=recommended' ) ); + printf( $string, network_admin_url( 'plugin-install.php?tab=recommended' ) ); ?>

Index: I:\000_WP_SVN\wp-core\src\wp-admin\edit.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\edit.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\edit.php (working copy) @@ -282,7 +282,7 @@

labels->name ); if ( current_user_can( $post_type_object->cap->create_posts ) ) - echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; + echo ' ', esc_html( $post_type_object->labels->add_new ), ''; if ( ! empty( $_REQUEST['s'] ) ) printf( ' ' . __('Search results for “%s”') . '', get_search_query() ); ?>

@@ -303,7 +303,7 @@ } if ( $messages ) - echo '

' . join( ' ', $messages ) . '

'; + echo '

', join( ' ', $messages ), '

'; unset( $messages ); $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed' ), $_SERVER['REQUEST_URI'] ); Index: I:\000_WP_SVN\wp-core\src\wp-admin\nav-menus.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\nav-menus.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\nav-menus.php (working copy) @@ -557,15 +557,15 @@ ' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '

'; + echo '

', __( 'Your theme supports one menu. Select which menu you would like to use.' ), '

'; } else { - echo '

' . sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '

'; + echo '

', sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ), '

'; } ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\plugin-install.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\plugin-install.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\plugin-install.php (working copy) @@ -105,7 +105,7 @@ $href = self_admin_url( 'plugin-install.php?tab=upload' ); $text = __( 'Upload Plugin' ); } - echo ' ' . $text . ''; + echo ' ', $text, ''; } ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\edit-form-advanced.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\edit-form-advanced.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\edit-form-advanced.php (working copy) @@ -404,7 +404,7 @@

cap->create_posts ) ) - echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; + echo ' ', esc_html( $post_type_object->labels->add_new ), ''; ?>

Index: I:\000_WP_SVN\wp-core\src\wp-admin\edit-comments.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\edit-comments.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\edit-comments.php (working copy) @@ -142,7 +142,7 @@

%s', get_edit_post_link( $post_id ), wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ) @@ -152,7 +152,7 @@ echo __('Comments'); if ( isset($_REQUEST['s']) && $_REQUEST['s'] ) - echo '' . sprintf( __( 'Search results for “%s”' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' ) ) . ''; ?> + echo '', sprintf( __( 'Search results for “%s”' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' ) ), ''; ?>

' . $error_msg . '

'; + echo '

', $error_msg, '

'; } if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQUEST['trashed']) || isset($_REQUEST['untrashed']) || isset($_REQUEST['spammed']) || isset($_REQUEST['unspammed']) || isset($_REQUEST['same']) ) { @@ -217,7 +217,7 @@ } } - echo '

' . implode( "
\n", $messages ) . '

'; + echo '

', implode( "
\n", $messages ), '

'; } } ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\widgets.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\widgets.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\widgets.php (working copy) @@ -240,7 +240,7 @@ if ( is_callable( $control_callback ) ) call_user_func_array( $control_callback, $control['params'] ); else - echo '

' . __('There are no options for this widget.') . "

\n"; ?> + echo '

', __( 'There are no options for this widget.' ), "

\n"; ?>

@@ -248,7 +248,7 @@ $sbvalue ) { - echo "\t\t @@ -299,20 +299,20 @@ $custom = true; foreach ( $time_formats as $format ) { - echo "\t
\n"; + echo ' /> ', date_i18n( $format ), "
\n"; } echo ' \n"; - echo '' . __( 'example:' ) . ' ' . date_i18n( get_option('time_format') ) . "\n"; + echo '/> ', __( 'Custom:' ), ' ', __( 'enter a custom time format in the following field' ), "\n", + '', __( 'example:' ), ' ', date_i18n( get_option( 'time_format' ) ), '', "\n"; - echo "\t

" . __('Documentation on date and time formatting.') . "

\n"; + echo "\t

", __( 'Documentation on date and time formatting.' ), "

\n"; ?> @@ -325,7 +325,7 @@ for ($day_index = 0; $day_index <= 6; $day_index++) : $selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : ''; - echo "\n\t'; + echo "\n\t", ''; endfor; ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\user-edit.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\user-edit.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\user-edit.php (working copy) @@ -322,9 +322,9 @@ // print the 'no role' option. Make it selected if the user has no role yet. if ( $user_role ) - echo ''; + echo ''; else - echo ''; + echo ''; ?> '; + echo ''; } reset( $blogs ); $num = count( $blogs ); @@ -114,8 +114,8 @@ $i = 0; foreach ( $row as $user_blog ) { $s = $i == 3 ? '' : 'border-right: 1px solid #ccc;'; - echo ""; + echo '

', apply_filters( 'myblogs_blog_actions', '' . __( 'Visit' ) . ' | ' . __( 'Dashboard' ) . '', $user_blog ), '

', + /** This filter is documented in wp-admin/my-sites.php */ + apply_filters( 'myblogs_options', '', $user_blog ), + ''; $i++; } - echo ""; + echo ''; }?>
"; + echo "\t\t", '
'; if ( 'wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr( $sbname, 0, 16 ) ) { echo ' '; } else { @@ -261,12 +261,12 @@ $j++; } $selected = ''; - echo "\t\t', "\n", + "\t\t", '\n"; for ( $i = 1; $i <= $j; $i++ ) { if ( in_array($widget_id, $sidebars_widgets[$sbname], true) ) $selected = selected( $i, $key + 1, false ); - echo "\t\t\n"; + echo "\t\t", '\n"; } echo "\t\t\n"; } Index: I:\000_WP_SVN\wp-core\src\wp-admin\export.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\export.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\export.php (working copy) @@ -137,7 +137,7 @@ continue; $month = zeroise( $date->month, 2 ); - echo ''; + echo ''; } } ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\ms-delete-site.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\ms-delete-site.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\ms-delete-site.php (working copy) @@ -31,8 +31,8 @@ $parent_file = 'tools.php'; require_once( ABSPATH . 'wp-admin/admin-header.php' ); -echo '
'; -echo '

' . esc_html( $title ) . '

'; +echo '
', + '

', esc_html( $title ), '

'; if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) { check_admin_referer( 'delete-blog' ); Index: I:\000_WP_SVN\wp-core\src\wp-admin\async-upload.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\async-upload.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\async-upload.php (working copy) @@ -59,10 +59,10 @@ switch ( $_REQUEST['fetch'] ) { case 3 : if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) ) - echo ''; - echo '' . _x( 'Edit', 'media item' ) . ''; + echo ''; + echo '', _x( 'Edit', 'media item' ), ''; $title = $post->post_title ? $post->post_title : wp_basename( $post->guid ); // title shouldn't ever be empty, but use filename just in cas.e - echo '
' . esc_html( wp_html_excerpt( $title, 60, '…' ) ) . '
'; + echo '
', esc_html( wp_html_excerpt( $title, 60, '…' ) ), '
'; break; case 2 : add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2); Index: I:\000_WP_SVN\wp-core\src\wp-admin\theme-install.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\theme-install.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\theme-install.php (working copy) @@ -117,8 +117,8 @@ */ $tabs = apply_filters( 'install_themes_tabs', array( 'upload' => __( 'Upload Theme' ) ) ); if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) { - echo ' ' . __( 'Upload Theme' ) . ''; - echo ' ' . _x( 'Browse', 'themes' ) . ''; + echo ' ', __( 'Upload Theme' ), '', + ' ', _x( 'Browse', 'themes' ), ''; } ?> @@ -149,17 +149,16 @@ $features ) { - echo '
'; - $feature_name = esc_html( $feature_name ); - echo '

' . $feature_name . '

'; - echo '
    '; + echo '
    ', + '

    ', esc_html( $feature_name ), '

    ', + '
      '; foreach ( $features as $feature => $feature_name ) { $feature = esc_attr( $feature ); - echo '
    1. '; - echo '
      2. '; + echo '
    2. ', + '
      3. '; } - echo '
    '; - echo '
    '; + echo '
', + '
'; } ?>
Index: I:\000_WP_SVN\wp-core\src\wp-admin\import.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\import.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\import.php (working copy) @@ -72,7 +72,7 @@ } if ( empty( $importers ) ) { - echo '

' . __('No importers are available.') . '

'; // TODO: make more helpful + echo '

', __( 'No importers are available.' ), '

'; // TODO: make more helpful } else { uasort( $importers, '_usort_by_first_member' ); ?> @@ -120,7 +120,7 @@ } if ( current_user_can('install_plugins') ) - echo '

' . sprintf( __('If the importer you need is not listed, search the plugin directory to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '

'; + echo '

', sprintf( __( 'If the importer you need is not listed, search the plugin directory to see if an importer is available.' ), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ), '

'; ?>
Index: I:\000_WP_SVN\wp-core\src\wp-admin\menu-header.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\menu-header.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\menu-header.php (working copy) @@ -127,9 +127,9 @@ $menu_file = substr( $menu_file, 0, $pos ); if ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) { $admin_is_parent = true; - echo "$arrow
$img
$title
"; + echo '', $arrow, '
', $img, '
', $title, '
'; } else { - echo "\n\t$arrow
$img
$title
"; + echo "\n\t", '', $arrow, '
', $img, '
', $title, '
'; } } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) { $menu_hook = get_plugin_page_hook( $item[2], 'admin.php' ); @@ -138,15 +138,15 @@ $menu_file = substr( $menu_file, 0, $pos ); if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) { $admin_is_parent = true; - echo "\n\t$arrow
$img
{$item[0]}
"; + echo "\n\t", '', $arrow, '
', $img, '
', $item[0], '
'; } else { - echo "\n\t$arrow
$img
{$item[0]}
"; + echo "\n\t", '', $arrow, '
', $img, '
', $item[0], '
'; } } if ( ! empty( $submenu_items ) ) { - echo "\n\t
    "; - echo "
  • {$item[0]}
    • "; + echo "\n\t", '
      ', + '
    • ', $item[0], '
      • '; $first = true; @@ -202,19 +202,19 @@ $sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), 'admin.php' ); $sub_item_url = esc_url( $sub_item_url ); - echo "$title"; + echo '', $title, ''; } else { - echo "$title"; + echo '', $title, ''; } } - echo "
    "; + echo '
'; } - echo ""; + echo ''; } - echo '
  • '; - echo '' . esc_html__( 'Collapse menu' ) . ''; - echo '
    • '; + echo '
  • ', + '', esc_html__( 'Collapse menu' ), '', + '
    • '; } ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\options-general.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\options-general.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\options-general.php (working copy) @@ -266,18 +266,18 @@ $custom = true; foreach ( $date_formats as $format ) { - echo "\t
    \n"; + echo ' /> ', date_i18n( $format ), "
    \n"; } echo ' \n"; - echo ' ' . __( 'example:' ) . ' ' . date_i18n( get_option('date_format') ) . " \n"; + echo '/> ', __( 'Custom:' ), ' ', __( 'enter a custom date format in the following field' ), "\n", + ' ', __( 'example:' ), ' ', date_i18n( get_option( 'date_format' ) ), ' ', "\n"; ?>

    ' . __( 'Global Settings' ) . '

    		'; - echo $settings_html; - echo '

    ', __( 'Global Settings' ), '

    		', + $settings_html, + '
    "; - echo "

    {$user_blog->blogname}

    "; + echo '    		', + '

    ', $user_blog->blogname, '

    '; /** * Filter the row links displayed for each site on the My Sites screen. * @@ -124,13 +124,13 @@ * @param string $string The HTML site link markup. * @param object $user_blog An object containing the site data. */ - echo "

    " . apply_filters( 'myblogs_blog_actions', "" . __( 'Visit' ) . " | " . __( 'Dashboard' ) . "", $user_blog ) . "

    "; - /** This filter is documented in wp-admin/my-sites.php */ - echo apply_filters( 'myblogs_options', '', $user_blog ); - echo "
    Index: I:\000_WP_SVN\wp-core\src\wp-admin\customize.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\customize.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\customize.php (working copy) @@ -146,7 +146,7 @@
    ' . get_bloginfo( 'name' ) . '' ); + printf( __( 'You are customizing %s' ), '' . get_bloginfo( 'name' ) . '' ); ?>
    ' . __('Plugin reactivated successfully.') . '

    '; + echo '

    ', __( 'Plugin reactivated successfully.' ), '

    '; if ( isset($_GET['failure']) ){ - echo '

    ' . __('Plugin failed to reactivate due to a fatal error.') . '

    '; + echo '

    ', __( 'Plugin failed to reactivate due to a fatal error.' ), '

    '; error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR ); @ini_set('display_errors', true); //Ensure that Fatal errors are displayed. Index: I:\000_WP_SVN\wp-core\src\wp-admin\credits.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\credits.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\credits.php (working copy) @@ -101,15 +101,15 @@ $credits = wp_credits(); if ( ! $credits ) { - echo '

    ' . sprintf( __( 'WordPress is created by a worldwide team of passionate individuals. Get involved in WordPress.' ), + echo '

    ', sprintf( __( 'WordPress is created by a worldwide team of passionate individuals. Get involved in WordPress.' ), 'https://wordpress.org/about/', /* translators: Url to the codex documentation on contributing to WordPress used on the credits page */ - __( 'http://codex.wordpress.org/Contributing_to_WordPress' ) ) . '

    '; + __( 'http://codex.wordpress.org/Contributing_to_WordPress' ) ), '

    '; include( ABSPATH . 'wp-admin/admin-footer.php' ); exit; } -echo '

    ' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "

    \n"; +echo '

    ', __( 'WordPress is created by a worldwide team of passionate individuals.' ), "

    \n"; $gravatar = is_ssl() ? 'https://secure.gravatar.com/avatar/' : 'http://0.gravatar.com/avatar/'; @@ -124,7 +124,7 @@ $title = translate( $group_data['name'] ); } - echo '

    ' . $title . "

    \n"; + echo '

    ', $title, "

    \n"; } if ( ! empty( $group_data['shuffle'] ) ) @@ -133,24 +133,24 @@ switch ( $group_data['type'] ) { case 'list' : array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles'] ); - echo '

    ' . wp_sprintf( '%l.', $group_data['data'] ) . "

    \n\n"; + echo '

    ', wp_sprintf( '%l.', $group_data['data'] ), "

    \n\n"; break; case 'libraries' : array_walk( $group_data['data'], '_wp_credits_build_object_link' ); - echo '

    ' . wp_sprintf( '%l.', $group_data['data'] ) . "

    \n\n"; + echo '

    ', wp_sprintf( '%l.', $group_data['data'] ), "

    \n\n"; break; default: $compact = 'compact' == $group_data['type']; $classes = 'wp-people-group ' . ( $compact ? 'compact' : '' ); - echo '
      ' . "\n"; + echo '\n"; Index: I:\000_WP_SVN\wp-core\src\wp-admin\user-new.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\user-new.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\user-new.php (working copy) @@ -253,7 +253,7 @@ if ( ! empty( $messages ) ) { foreach ( $messages as $msg ) - echo '

      ' . $msg . '

      '; + echo '

      ', $msg, '

      '; } ?> @@ -269,13 +269,13 @@ ' . __('Add Existing User') . ''; + echo '

      ', __( 'Add Existing User' ), '

      '; if ( !is_super_admin() ) { - echo '

      ' . __( '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.' ) . '

      '; + echo '

      ', __( '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'); $type = 'email'; } else { - echo '

      ' . __( '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.' ) . '

      '; + echo '

      ', __( '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'); $type = 'text'; } @@ -331,7 +331,7 @@ if ( current_user_can( 'create_users') ) { if ( $do_both ) - echo '

      ' . __( 'Add New User' ) . '

      '; + echo '

      ', __( 'Add New User' ), '

      '; ?>

      ' . __('ERROR:') . ' ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '

    '; - echo '
    '; + echo '

    ', __( 'ERROR:' ), ' ', __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ), '

    ', + ''; include( ABSPATH . 'wp-admin/admin-footer.php' ); die(); } $active_plugins = get_option( 'active_plugins' ); if ( ! empty( $active_plugins ) ) { - echo '

    ' . __('Warning:') . ' ' . sprintf( __( 'Please deactivate your plugins before enabling the Network feature.' ), admin_url( 'plugins.php?plugin_status=active' ) ) . '

    ' . __( 'Once the network is created, you may reactivate your plugins.' ) . '

    '; - echo ''; + echo '

    ', __( 'Warning:' ), ' ', sprintf( __( 'Please deactivate your plugins before enabling the Network feature.' ), admin_url( 'plugins.php?plugin_status=active' ) ), '

    ', __( 'Once the network is created, you may reactivate your plugins.' ), '

    ', + ''; include( ABSPATH . 'wp-admin/admin-footer.php' ); die(); } @@ -171,10 +171,10 @@ $hostname = get_clean_basedomain(); $has_ports = strstr( $hostname, ':' ); if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) { - echo '

    ' . __( 'ERROR:') . ' ' . __( 'You cannot install a network of sites with your server address.' ) . '

    '; - echo '

    ' . sprintf( __( 'You cannot use port numbers such as %s.' ), $has_ports ) . '

    '; - echo '' . __( 'Return to Dashboard' ) . ''; - echo ''; + echo '

    ', __( 'ERROR:' ), ' ', __( 'You cannot install a network of sites with your server address.' ), '

    ', + '

    ', sprintf( __( 'You cannot use port numbers such as %s.' ), $has_ports ), '

    ', + '', __( 'Return to Dashboard' ), '', + ''; include( ABSPATH . 'wp-admin/admin-footer.php' ); die(); } @@ -185,7 +185,7 @@ $error_codes = array(); if ( is_wp_error( $errors ) ) { - echo '

    ' . __( 'ERROR: The network could not be created.' ) . '

    '; + echo '

    ', __( 'ERROR: The network could not be created.' ), '

    '; foreach ( $errors->get_error_messages() as $error ) echo "

    $error

    "; echo '
    '; @@ -208,11 +208,11 @@ } else { $subdomain_install = false; if ( $got_mod_rewrite = got_mod_rewrite() ) // dangerous assumptions - echo '

    ' . __( 'Note:' ) . ' ' . __( 'Please make sure the Apache mod_rewrite module is installed as it will be used at the end of this installation.' ) . '

    '; + echo '

    ', __( 'Note:' ), ' ', __( 'Please make sure the Apache mod_rewrite module is installed as it will be used at the end of this installation.' ), '

    '; elseif ( $is_apache ) - echo '

    ' . __( 'Warning!' ) . ' ' . __( 'It looks like the Apache mod_rewrite module is not installed.' ) . '

    '; + echo '

    ', __( 'Warning!' ), ' ', __( 'It looks like the Apache mod_rewrite module is not installed.' ), '

    '; if ( $got_mod_rewrite || $is_apache ) // Protect against mod_rewrite mimicry (but ! Apache) - echo '

    ' . __( 'If mod_rewrite is disabled, ask your administrator to enable that module, or look at the Apache documentation or elsewhere for help setting it up.' ) . '

    '; + echo '

    ', __( 'If mod_rewrite is disabled, ask your administrator to enable that module, or look at the Apache documentation or elsewhere for help setting it up.' ), '

    '; } if ( allow_subdomain_install() && allow_subdirectory_install() ) : ?> @@ -243,7 +243,7 @@ endif; if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) ) - echo '

    ' . __('Warning!') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '

    '; + echo '

    ', __( 'Warning!' ), ' ', __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ), '

    '; $is_www = ( 0 === strpos( $hostname, 'www.' ) ); if ( $is_www ) : @@ -269,7 +269,7 @@ _e( 'Because you are using localhost, the sites in your WordPress network must use sub-directories. Consider using localhost.localdomain if you wish to use sub-domains.' ); // Uh oh: if ( !allow_subdirectory_install() ) - echo ' ' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; + echo ' ', __( 'Warning!' ), ' ', __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ), ''; ?> @@ -279,14 +279,14 @@ _e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.' ); // Uh oh: if ( !allow_subdirectory_install() ) - echo ' ' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; + echo ' ', __( 'Warning!' ), ' ', __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ), ''; ?> ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; + echo ' ', __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ), ''; ?> @@ -348,7 +348,7 @@ // Wildcard DNS message. if ( is_wp_error( $errors ) ) - echo '
    ' . $errors->get_error_message() . '
    '; + echo '
    ', $errors->get_error_message(), '
    '; if ( $_POST ) { if ( allow_subdomain_install() ) @@ -496,7 +496,7 @@ 'web.config', '' . $home_path . '' ); echo '

    '; if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) - echo '

    ' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '

    '; + echo '

    ', __( 'Warning:' ), ' ', __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ), '

    '; ?> @@ -533,7 +533,7 @@ '.htaccess', '' . $home_path . '' ); echo '

    '; if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) - echo '

    ' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '

    '; + echo '

    ', __( 'Warning:' ), ' ', __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ), '

    '; ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\theme-editor.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\theme-editor.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\theme-editor.php (working copy) @@ -147,7 +147,7 @@ continue; $selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : ''; - echo "\n\t" . ''; + echo "\n\t", ''; } ?> @@ -158,7 +158,7 @@
    errors() ) - echo '

    ' . __( 'This theme is broken.' ) . ' ' . $theme->errors()->get_error_message() . '

    '; + echo '

    ', __( 'This theme is broken.' ), ' ', $theme->errors()->get_error_message(), '

    '; ?>
    $absolute_filename ) : if ( 'style.css' == $filename ) - echo "\t\n\t

    " . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "

    \n\t
      \n"; + echo "\t
    \n\t

    ", _x( 'Styles', 'Theme stylesheets in theme editor' ), "

    \n\t
      \n"; $file_description = get_file_description( $absolute_filename ); if ( $file_description != basename( $filename ) ) @@ -192,7 +192,7 @@

    ' . __('Oops, no such file exists! Double check the name and try again, merci.') . '

    '; + echo '

    ', __( 'Oops, no such file exists! Double check the name and try again, merci.' ), '

    '; else : ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\comment.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\comment.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\comment.php (working copy) @@ -150,7 +150,7 @@ break; } if ( $message ) { - echo '

    ' . $message . '

    '; + echo '

    ', $message, '

    '; } } ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\update-core.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\update-core.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\update-core.php (working copy) @@ -71,14 +71,14 @@ $download = sprintf(__('Download %s'), $version_string); } - echo '

    '; - echo $message; - echo '

    '; - echo ''; + echo '

    ', + $message, + '

    ', + ''; wp_nonce_field('upgrade-core'); - echo '

    '; - echo ''; - echo ''; + echo '

    ', + '', + ''; if ( $show_buttons ) { if ( $first_pass ) { submit_button( $submit, $current ? 'button' : 'primary regular', 'upgrade', false ); @@ -86,7 +86,7 @@ } else { submit_button( $submit, 'button', 'upgrade', false ); } - echo ' ' . $download . ' '; + echo ' ', $download, ' '; } if ( 'en_US' != $update->locale ) if ( !isset( $update->dismissed ) || !$update->dismissed ) @@ -95,10 +95,10 @@ submit_button( __('Bring back this update'), 'button', 'undismiss', false ); echo '

    '; if ( 'en_US' != $update->locale && ( !isset($wp_local_package) || $wp_local_package != $update->locale ) ) - echo '

    '.__('This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation.').'

    '; + echo '

    ', __( 'This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation.' ), '

    '; // Partial builds don't need language-specific warnings. elseif ( 'en_US' == $update->locale && get_locale() != 'en_US' && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) { - echo '

    '.sprintf( __('You are about to install WordPress %s in English (US). There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.'), $update->response != 'development' ? $update->current : '' ).'

    '; + echo '

    ', sprintf( __( 'You are about to install WordPress %s in English (US). There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.' ), ( $update->response != 'development' ? $update->current : '' ) ), '

    '; } echo ''; @@ -120,8 +120,8 @@ }); '.__('Show hidden updates').'

    '; - echo '
      '; + echo '

      ', __( 'Show hidden updates' ), '

      ', + '
        '; foreach( (array) $dismissed as $update) { echo '
      • '; list_core_update( $update ); @@ -158,7 +158,7 @@ ); $should_auto_update = $upgrader->should_update( 'core', $future_minor_update, ABSPATH ); if ( $should_auto_update ) - echo ' ' . __( 'Future security updates will be applied automatically.' ); + echo ' ', __( 'Future security updates will be applied automatically.' ); } echo ''; } else { @@ -175,9 +175,9 @@ require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; $upgrader = new WP_Automatic_Updater; if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) ) { - echo '

        '; - echo '' . __( 'BETA TESTERS:' ) . ' ' . __( 'This site is set up to install updates of future beta versions automatically.' ); - echo '

        '; + echo '

        ', + '', __( 'BETA TESTERS:' ), ' ', __( 'This site is set up to install updates of future beta versions automatically.' ), + '

        '; } } @@ -190,10 +190,10 @@ echo '
      '; // Don't show the maintenance mode notice when we are only showing a single re-install option. if ( $updates && ( count( $updates ) > 1 || $updates[0]->response != 'latest' ) ) { - 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.' ) . '

      '; + 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.' ), '

      '; } elseif ( ! $updates ) { 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 %s.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ), '

      '; } dismissed_updates(); } @@ -206,8 +206,8 @@ require_once(ABSPATH . 'wp-admin/includes/plugin-install.php'); $plugins = get_plugin_updates(); if ( empty( $plugins ) ) { - echo '

      ' . __( 'Plugins' ) . '

      '; - echo '

      ' . __( 'Your plugins are all up to date.' ) . '

      '; + echo '

      ', __( 'Plugins' ), '

      ', + '

      ', __( 'Your plugins are all up to date.' ), '

      '; return; } $form_action = 'update-core.php?action=do-plugin-upgrade'; @@ -292,8 +292,8 @@ function list_theme_updates() { $themes = get_theme_updates(); if ( empty( $themes ) ) { - echo '

      ' . __( 'Themes' ) . '

      '; - echo '

      ' . __( 'Your themes are all up to date.' ) . '

      '; + echo '

      ', __( 'Themes' ), '

      ', + '

      ', __( 'Your themes are all up to date.' ), '

      '; return; } @@ -342,8 +342,8 @@ $updates = wp_get_translation_updates(); if ( ! $updates ) { if ( 'en_US' != get_locale() ) { - echo '

      ' . __( 'Translations' ) . '

      '; - echo '

      ' . __( 'Your translations are all up to date.' ) . '

      '; + echo '

      ', __( 'Translations' ), '

      ', + '

      ', __( 'Your translations are all up to date.' ), '

      '; } return; } @@ -524,8 +524,8 @@ echo '

      '; /* translators: %1 date, %2 time. */ printf( __('Last checked on %1$s at %2$s.'), date_i18n( get_option( 'date_format' ) ), date_i18n( get_option( 'time_format' ) ) ); - echo '   ' . __( 'Check Again' ) . ''; - echo '

      '; + echo '   ', __( 'Check Again' ), '', + '

      '; if ( $core = current_user_can( 'update_core' ) ) core_upgrade_preamble(); @@ -591,10 +591,10 @@ $title = __('Update Plugins'); require_once(ABSPATH . 'wp-admin/admin-header.php'); - echo '
      '; - echo '

      ' . esc_html__('Update Plugins') . '

      '; - echo ''; - echo '
      '; + echo '
      ', + '

      ', esc_html__( 'Update Plugins' ), '

      ', + '', + '
      '; include(ABSPATH . 'wp-admin/admin-footer.php'); } elseif ( 'do-theme-upgrade' == $action ) { Index: I:\000_WP_SVN\wp-core\src\wp-admin\users.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\users.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\users.php (working copy) @@ -233,9 +233,9 @@ foreach ( $userids as $id ) { $user = get_userdata( $id ); if ( $id == $current_user->ID ) { - echo "
    • " . sprintf(__('ID #%1$s: %2$s The current user will not be deleted.'), $id, $user->user_login) . "
      • \n"; + echo '
    • ', sprintf( __( 'ID #%1$s: %2$s The current user will not be deleted.' ), $id, $user->user_login ), "
      • \n"; } else { - echo "
    • " . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "
      • \n"; + echo '
    • ', sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ), "
      • \n"; $go_delete++; } } @@ -345,11 +345,11 @@ $id = (int) $id; $user = get_userdata( $id ); if ( $id == $current_user->ID && !is_super_admin() ) { - echo "
    • " . sprintf(__('ID #%1$s: %2$s The current user will not be removed.'), $id, $user->user_login) . "
      • \n"; + echo '
    • ', sprintf( __( 'ID #%1$s: %2$s The current user will not be removed.' ), $id, $user->user_login ), "
      • \n"; } elseif ( !current_user_can('remove_user', $id) ) { - echo "
    • " . sprintf(__('ID #%1$s: %2$s You don\'t have permission to remove this user.'), $id, $user->user_login) . "
      • \n"; + echo '
    • ', sprintf( __( 'ID #%1$s: %2$s You don\'t have permission to remove this user.' ), $id, $user->user_login ), "
      • \n"; } else { - echo "
    • " . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "
      • \n"; + echo '
    • ', sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ), "
      • \n"; $go_remove = true; } } Index: I:\000_WP_SVN\wp-core\src\wp-admin\custom-header.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\custom-header.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\custom-header.php (working copy) @@ -265,11 +265,11 @@ } if ( 1 < count( $headers ) ) { - echo '
      '; - echo ''; - echo '
      '; + echo '
      ', + '', + '
      '; } echo '
      '; @@ -278,11 +278,11 @@ $header_url = $header['url']; $header_desc = empty( $header['description'] ) ? '' : $header['description']; echo '
      '; - echo ''; echo '
      '; } echo '
      '; @@ -647,9 +647,9 @@ $header_textcolor = '#' . $header_textcolor; } - echo ''; + echo ''; if ( $default_color ) { - echo ' ' . sprintf( _x( 'Default: %s', 'color' ), esc_html( $default_color ) ) . ''; + echo ' ', sprintf( _x( 'Default: %s', 'color' ), esc_html( $default_color ) ), ''; } ?>

      Index: I:\000_WP_SVN\wp-core\src\wp-admin\themes.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\themes.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\themes.php (working copy) @@ -149,7 +149,7 @@ $ct = wp_get_theme(); if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) { - echo '

      ' . sprintf( __( 'ERROR: %s' ), $ct->errors()->get_error_message() ) . '

      '; + echo '

      ', sprintf( __( 'ERROR: %s' ), $ct->errors()->get_error_message() ), '

      '; } /* Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-ms-sites-list-table.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-ms-sites-list-table.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-ms-sites-list-table.php (working copy) @@ -230,7 +230,7 @@ $blog_state .= "$state$sep"; } } - echo ""; + echo ''; $blogname = ( is_subdomain_install() ) ? str_replace( '.' . get_current_site()->domain, '', $blog['domain'] ) : $blog['path']; @@ -265,7 +265,7 @@ ' . sprintf( _x( '%1$s – %2$s', '%1$s: site name. %2$s: site tagline.' ), get_option( 'blogname' ), get_option( 'blogdescription ' ) ) . '

      '; + echo '

      ', sprintf( _x( '%1$s – %2$s', '%1$s: site name. %2$s: site tagline.' ), get_option( 'blogname' ), get_option( 'blogdescription ' ) ), '

      '; restore_current_blog(); } @@ -351,13 +351,13 @@ $blogusers_warning = __( 'Only showing first 5 users.' ) . ' ' . __( 'More' ) . ''; } foreach ( $blogusers as $user_object ) { - echo '' . esc_html( $user_object->user_login ) . ' '; + echo '', esc_html( $user_object->user_login ), ' '; if ( 'list' != $mode ) - echo '( ' . $user_object->user_email . ' )'; + echo '( ', $user_object->user_email, ' )'; echo '
      '; } if ( $blogusers_warning != '' ) - echo '' . $blogusers_warning . '
      '; + echo '', $blogusers_warning, '
      '; } ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\plugin.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\plugin.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\plugin.php (working copy) @@ -1873,7 +1873,7 @@ * @param string $option_group A settings group name. This should match the group name used in register_setting(). */ function settings_fields($option_group) { - echo ""; + echo ''; echo ''; wp_nonce_field("$option_group-options"); } Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\ms.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\ms.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\ms.php (working copy) @@ -387,7 +387,7 @@ */ function new_user_email_admin_notice() { if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( get_current_user_id() . '_new_email' ) ) - echo "
      " . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "
      "; + echo '
      ', sprintf( __( 'Your email address has not been updated yet. Please check your inbox at %s for a confirmation email.' ), $email['newemail'] ), '
      '; } add_action( 'admin_notices', 'new_user_email_admin_notice' ); @@ -734,7 +734,7 @@ if ( !is_super_admin() ) return false; if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) - echo "
      " . sprintf( __( 'Thank you for Updating! Please visit the Upgrade Network page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "
      "; + echo '
      ', sprintf( __( 'Thank you for Updating! Please visit the Upgrade Network page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ), '
      '; } add_action( 'admin_notices', 'site_admin_notice' ); add_action( 'network_admin_notices', 'site_admin_notice' ); Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-ms-themes-list-table.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-ms-themes-list-table.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-ms-themes-list-table.php (working copy) @@ -384,21 +384,21 @@ switch ( $column_name ) { case 'cb': - echo "$checkbox"; + echo '', $checkbox, ''; break; case 'name': - echo "" . $theme->display('Name') . ""; - echo $this->row_actions( $actions, true ); - echo ""; + echo '', $theme->display( 'Name' ), '', + $this->row_actions( $actions, true ), + ''; break; case 'description': echo ""; if ( $theme->errors() ) { $pre = $status == 'broken' ? __( 'Broken Theme:' ) . ' ' : ''; - echo '

      ' . $pre . $theme->errors()->get_error_message() . '

      '; + echo '

      ', $pre, $theme->errors()->get_error_message(), '

      '; } - echo "

      " . $theme->display( 'Description' ) . "

      -
      "; + echo '

      ', $theme->display( 'Description' ), '

      +
      '; $theme_meta = array(); Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\screen.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\screen.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\screen.php (working copy) @@ -82,9 +82,9 @@ if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] ) continue; $box_id = $box['id']; - echo '\n"; + echo '\n"; } } } @@ -1047,8 +1047,8 @@ $welcome_checked = false; } echo '\n"; + echo ''; + echo _x( 'Welcome', 'Welcome panel' ), "\n"; } ?>
      @@ -1072,9 +1072,9 @@ if ( 'comments' == $column ) $title = __( 'Comments' ); $id = "$column-hide"; - echo '\n"; + echo '\n"; } ?>
      Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-posts-list-table.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-posts-list-table.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-posts-list-table.php (working copy) @@ -282,7 +282,7 @@ 'selected' => $cat ); - echo ''; + echo ''; wp_dropdown_categories( $dropdown_options ); } @@ -724,18 +724,18 @@ if ( $format = get_post_format( $post->ID ) ) { $label = get_post_format_string( $format ); - echo '' . $label . ": "; + echo '', $label, ': '; } if ( $can_edit_post && $post->post_status != 'trash' ) { - echo '' . $pad . $title . ''; + echo '', $pad, $title, ''; } else { - echo $pad . $title; + echo $pad, $title; } _post_states( $post ); if ( isset( $parent_name ) ) - echo ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name ); + echo ' | ', $post_type_object->labels->parent_item_colon, ' ', esc_html( $parent_name ); echo "\n"; @@ -747,7 +747,7 @@ $locked_avatar = $locked_text = ''; } - echo '
      ' . $locked_avatar . ' ' . $locked_text . "
      \n"; + echo '
      ', $locked_avatar, ' ', $locked_text, "
      \n"; } if ( ! $this->hierarchical_display && 'excerpt' == $mode && current_user_can( 'read_post', $post->ID ) ) @@ -834,7 +834,7 @@ $h_time = mysql2date( __( 'Y/m/d' ), $m_time ); } - echo ''; + echo ''; if ( 'excerpt' == $mode ) { /** @@ -855,14 +855,14 @@ } else { /** This filter is documented in wp-admin/includes/class-wp-posts-list-table.php */ - echo '' . apply_filters( 'post_date_column_time', $h_time, $post, $column_name, $mode ) . ''; + echo '', apply_filters( 'post_date_column_time', $h_time, $post, $column_name, $mode ), ''; } echo '
      '; if ( 'publish' == $post->post_status ) { _e( 'Published' ); } elseif ( 'future' == $post->post_status ) { if ( $time_diff > 0 ) - echo '' . __( 'Missed schedule' ) . ''; + echo '', __( 'Missed schedule' ), ''; else _e( 'Scheduled' ); } else { @@ -906,7 +906,7 @@ if ( $taxonomy ) { $taxonomy_object = get_taxonomy( $taxonomy ); - echo ''; + echo ''; if ( $terms = get_the_terms( $post->ID, $taxonomy ) ) { $out = array(); foreach ( $terms as $t ) { Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-terms-list-table.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-terms-list-table.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-terms-list-table.php (working copy) @@ -186,7 +186,7 @@ $terms = get_terms( $taxonomy, $args ); if ( empty( $terms ) ) { - echo ''; + echo ''; $this->no_items(); echo ''; return; @@ -277,7 +277,7 @@ $this->level = $level; - echo ''; + echo ''; $this->single_row_columns( $tag ); echo ''; } Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\widgets.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\widgets.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\widgets.php (working copy) @@ -70,7 +70,7 @@ $description = wp_sidebar_description( $sidebar ); - echo '
      '; + echo '
      '; if ( $sidebar_name ) { ?> @@ -84,7 +84,7 @@ echo '
      '; if ( ! empty( $description ) ) { - echo '

      ' . $description . '

      '; + echo '

      ', $description, '

      '; } echo '
      '; @@ -211,7 +211,7 @@ if ( isset($control['callback']) ) $has_form = call_user_func_array( $control['callback'], $control['params'] ); else - echo "\t\t

      " . __('There are no options for this widget.') . "

      \n"; ?> + echo "\t\t

      ", __( 'There are no options for this widget.' ), "

      \n"; ?>
      Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-users-list-table.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-users-list-table.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-users-list-table.php (working copy) @@ -318,7 +318,7 @@ if ( is_multisite() && empty( $user_object->allcaps ) ) continue; - echo "\n\t" . $this->single_row( $user_object, $style = '', $role, isset( $post_counts ) ? $post_counts[ $userid ] : 0 ); + echo "\n\t", $this->single_row( $user_object, $style = '', $role, isset( $post_counts ) ? $post_counts[ $userid ] : 0 ); } } Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\dashboard.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\dashboard.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\dashboard.php (working copy) @@ -158,7 +158,7 @@ echo '
      '; wp_dashboard_trigger_widget_control( $meta_box['id'] ); wp_nonce_field( 'edit-dashboard-widget_' . $meta_box['id'], 'dashboard-widget-nonce' ); - echo ''; + echo ''; submit_button( __('Submit') ); echo '
      '; } @@ -263,7 +263,7 @@ $elements = apply_filters( 'dashboard_glance_items', array() ); if ( $elements ) { - echo '
    • ' . implode( "
      • \n
    • ", $elements ) . "
      • \n"; + echo '
    • ', implode( "
      • \n
    • ", $elements ), "
      • \n"; } ?> @@ -298,7 +298,7 @@ */ $content = apply_filters( 'privacy_on_link_text' , __( 'Search Engines Discouraged' ) ); - echo "

      $content

      "; + echo '

      ', $content, '

      '; } ?>
      @@ -356,7 +356,7 @@ foreach ( $actions as $class => $action ) { $actions[ $class ] = "\t
    • $action"; } - echo implode( " |
      • \n", $actions ) . "\n"; + echo implode( " |\n", $actions ), "\n"; echo '
    '; } ?> @@ -498,19 +498,19 @@ echo '
    '; if ( count( $drafts ) > 3 ) { - echo '

    ' . _x( 'View all', 'drafts' ) . "

    \n"; + echo '

    ', _x( 'View all', 'drafts' ), "

    \n"; } - echo '

    ' . __( 'Drafts' ) . "

    \n
      "; + echo '

      ', __( 'Drafts' ), "

      \n
        "; $drafts = array_slice( $drafts, 0, 3 ); foreach ( $drafts as $draft ) { $url = get_edit_post_link( $draft->ID ); $title = _draft_or_post_title( $draft->ID ); - echo "
      • \n"; - echo '
        ' . esc_html( $title ) . ''; - echo '
        '; + echo "
      • \n", + '
        ', esc_html( $title ), '', + '
        '; if ( $the_content = wp_trim_words( $draft->post_content, 10 ) ) { - echo '

        ' . $the_content . '

        '; + echo '

        ', $the_content, '

        '; } echo "
        • \n"; } @@ -655,10 +655,10 @@ $recent_comments = wp_dashboard_recent_comments(); if ( !$future_posts && !$recent_posts && !$recent_comments ) { - echo '
        '; - echo '

        '; - echo '

        ' . __( 'No activity yet!' ) . '

        '; - echo '
        '; + echo '
        ', + '

        ', + '

        ', __( 'No activity yet!' ), '

        ', + '
        '; } echo '
    '; @@ -704,11 +704,9 @@ if ( $posts->have_posts() ) { - echo '
    '; - - echo '

    ' . $args['title'] . '

    '; - - echo '
      '; + echo '
      ', + '

      ', $args['title'], '

      ', + '
        '; $today = date( 'Y-m-d', current_time( 'timestamp' ) ); $tomorrow = date( 'Y-m-d', strtotime( '+1 day', current_time( 'timestamp' ) ) ); @@ -778,10 +776,10 @@ } if ( $comments ) { - echo '
        '; - echo '

        ' . __( 'Comments' ) . '

        '; + echo '
        ', + '

        ', __( 'Comments' ), '

        ', + '
        '; - echo '
        '; foreach ( $comments as $comment ) _wp_dashboard_recent_comments_row( $comment ); echo '
        '; @@ -1103,7 +1101,7 @@ $title = esc_html( $item->get_title() ); $ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) . '&TB_iframe=true&width=600&height=800'; - echo "
      • " . __( 'Popular Plugin' ) . ": $title (" . __( 'Install' ) . ")
        • "; + echo '
      • ', __( 'Popular Plugin' ), ': ', $title, ' (', __( 'Install' ), ')
        • '; $feed->__destruct(); unset( $feed ); @@ -1323,9 +1321,9 @@ printf( __( 'Manage widgets or menus' ), admin_url( 'widgets.php' ), admin_url( 'nav-menus.php' ) ); } elseif ( current_theme_supports( 'widgets' ) ) { - echo '' . __( 'Manage widgets' ) . ''; + echo '', __( 'Manage widgets' ), ''; } else { - echo '' . __( 'Manage menus' ) . ''; + echo '', __( 'Manage menus' ), ''; } ?>
        Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-media-list-table.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-media-list-table.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-media-list-table.php (working copy) @@ -302,7 +302,7 @@ ?> - + @@ -454,7 +454,7 @@ $taxonomy = false; if ( $taxonomy ) { - echo ''; + echo ''; if ( $terms = get_the_terms( $post->ID, $taxonomy ) ) { $out = array(); foreach ( $terms as $t ) { Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\template.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\template.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\template.php (working copy) @@ -391,13 +391,13 @@
        ' . esc_html( $post->post_password ) . '
        '; if ( $post_type_object->hierarchical ) - echo '
        ' . $post->post_parent . '
        '; + echo '
        ', $post->post_parent, '
        '; if ( $post->post_type == 'page' ) - echo '
        ' . esc_html( get_post_meta( $post->ID, '_wp_page_template', true ) ) . '
        '; + echo '
        ', esc_html( get_post_meta( $post->ID, '_wp_page_template', true ) ), '
        '; if ( post_type_supports( $post->post_type, 'page-attributes' ) ) - echo '
        ' . $post->menu_order . '
        '; + echo '
        ', $post->menu_order, '
        '; $taxonomy_names = get_object_taxonomies( $post->post_type ); foreach ( $taxonomy_names as $taxonomy_name) { @@ -412,21 +412,21 @@ } $term_ids = empty( $terms ) ? array() : wp_list_pluck( $terms, 'term_id' ); - echo '
        ' . implode( ',', $term_ids ) . '
        '; + echo '
        ', implode( ',', $term_ids ), '
        '; } elseif ( $taxonomy->show_ui ) { - echo '
        ' - . esc_html( str_replace( ',', ', ', get_terms_to_edit( $post->ID, $taxonomy_name ) ) ) . '
        '; + echo '
        ', + esc_html( str_replace( ',', ', ', get_terms_to_edit( $post->ID, $taxonomy_name ) ) ), '
        '; } } if ( !$post_type_object->hierarchical ) - echo '
        ' . (is_sticky($post->ID) ? 'sticky' : '') . '
        '; + echo '
        ', ( is_sticky( $post->ID ) ? 'sticky' : '' ), '
        '; if ( post_type_supports( $post->post_type, 'post-formats' ) ) - echo '
        ' . esc_html( get_post_format( $post->ID ) ) . '
        '; + echo '
        ', esc_html( get_post_format( $post->ID ) ), '
        '; echo '
        '; } @@ -705,7 +705,7 @@ foreach ( $keys as $key ) { if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) ) continue; - echo "\n"; + echo "\n", ''; } ?> @@ -790,7 +790,7 @@ /* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */ printf( __( '%1$s %2$s, %3$s @ %4$s : %5$s' ), $month, $day, $year, $hour, $minute ); - echo '
        '; + echo '
      '; if ( $multi ) return; @@ -805,9 +805,9 @@ foreach ( $map as $timeunit => $value ) { list( $unit, $curr ) = $value; - echo '' . "\n"; + echo '', "\n"; $cur_timeunit = 'cur_' . $timeunit; - echo '' . "\n"; + echo '', "\n"; } ?> @@ -830,7 +830,7 @@ ksort( $templates ); foreach ( array_keys( $templates ) as $template ) { $selected = selected( $default, $templates[ $template ], false ); - echo "\n\t"; + echo "\n\t", ''; } } @@ -859,7 +859,7 @@ $pad = str_repeat( ' ', $level * 3 ); $selected = selected( $default, $item->ID, false ); - echo "\n\t"; + echo "\n\t",''; parent_dropdown( $default, $item->ID, $level +1 ); } } else { @@ -887,7 +887,7 @@ else $r .= "\n\t"; } - echo $p . $r; + echo $p, $r; } /** @@ -1066,20 +1066,20 @@ continue; $i++; $hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : ''; - echo '
      ' . "\n"; + echo '
      ', "\n"; if ( 'dashboard_browser_nag' != $box['id'] ) - echo '

      '; - echo "

      {$box['title']}

      \n"; - echo '
      ' . "\n"; + echo '

      '; + echo '

      ', $box['title'], "

      \n", + '
      ', "\n"; call_user_func($box['callback'], $object, $box); - echo "
      \n"; - echo "
      \n"; + echo "
      \n", + "
      \n"; } } } } - echo "
    "; + echo '
    '; return $i; @@ -1297,7 +1297,7 @@ foreach ( (array) $wp_settings_sections[$page] as $section ) { if ( $section['title'] ) - echo "

    {$section['title']}

    \n"; + echo '

    ', $section['title'], "

    \n"; if ( $section['callback'] ) call_user_func( $section['callback'], $section ); @@ -1337,12 +1337,12 @@ $class = ' class="' . esc_attr( $field['args']['class'] ) . '"'; } - echo ""; + echo ''; if ( ! empty( $field['args']['label_for'] ) ) { - echo ''; + echo ''; } else { - echo '' . $field['title'] . ''; + echo '', $field['title'], ''; } echo ''; @@ -2229,12 +2229,12 @@ $title = sprintf( __( '%s rating' ), number_format_i18n( $rating, 1 ) ); } - echo '
    '; - echo '' . $title . ''; - echo str_repeat( '
    ', $full_stars ); - echo str_repeat( '
    ', $half_stars ); - echo str_repeat( '
    ', $empty_stars); - echo '
    '; + echo '
    ', + '', $title, '', + str_repeat( '
    ', $full_stars ), + str_repeat( '
    ', $half_stars ), + str_repeat( '
    ', $empty_stars ), + '
    '; } /** @@ -2244,5 +2244,5 @@ * @since 4.2.0 */ function _wp_posts_page_notice() { - echo '

    ' . __( 'You are currently editing the page that shows your latest posts.' ) . '

    '; + echo '

    ', __( 'You are currently editing the page that shows your latest posts.' ), '

    '; } Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\image-edit.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\image-edit.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\image-edit.php (working copy) @@ -70,7 +70,7 @@

    Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-ftp.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-ftp.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-ftp.php (working copy) @@ -225,7 +225,7 @@ function SendMSG($message = "", $crlf=true) { if ($this->Verbose) { - echo $message.($crlf?CRLF:""); + echo $message, ( $crlf ? CRLF : '' ); flush(); } return TRUE; Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-plugins-list-table.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-plugins-list-table.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-plugins-list-table.php (working copy) @@ -359,9 +359,9 @@ if ( ! $this->screen->in_admin( 'network' ) && 'recently_activated' == $status ) submit_button( __( 'Clear List' ), 'button', 'clear-recent-list', false ); elseif ( 'top' == $which && 'mustuse' == $status ) - echo '

    ' . sprintf( __( 'Files in the %s directory are executed automatically.' ), str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) ) . '

    '; + echo '

    ', sprintf( __( 'Files in the %s directory are executed automatically.' ), str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) ), '

    '; elseif ( 'top' == $which && 'dropins' == $status ) - echo '

    ' . sprintf( __( 'Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present.' ), str_replace( ABSPATH, '', WP_CONTENT_DIR ) ) . '

    '; + echo '

    ', sprintf( __( 'Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present.' ), str_replace( ABSPATH, '', WP_CONTENT_DIR ) ), '

    '; echo '
    '; } Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\plugin-install.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\plugin-install.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\plugin-install.php (working copy) @@ -246,7 +246,7 @@ } break; case 'install_plugins_recommended' : - echo '

    ' . __( 'These suggestions are based on the plugins you and other users have installed.' ) . '

    '; + echo '

    ', __( 'These suggestions are based on the plugins you and other users have installed.' ), '

    '; break; } @@ -421,9 +421,9 @@ '; - echo "

    {$api->name}

    "; - echo "
    \n"; + echo '
    ', + '

    ', $api->name, '

    ', + '
    \n"; foreach ( (array) $api->sections as $section_name => $content ) { if ( 'reviews' === $section_name && ( empty( $api->ratings ) || 0 === array_sum( (array) $api->ratings ) ) ) { @@ -468,7 +468,7 @@ if ( $api->active_installs >= 1000000 ) { _ex( '1+ Million', 'Active plugin installs' ); } else { - echo number_format_i18n( $api->active_installs ) . '+'; + echo number_format_i18n( $api->active_installs ), '+'; } ?> slug ) && empty( $api->external ) ) { ?> @@ -515,9 +515,9 @@ } $contrib_username = sanitize_user( $contrib_username ); if ( empty( $contrib_profile ) ) { - echo "
  • {$contrib_username}
    • "; + echo '
  • ', $contrib_username, '
    • '; } else { - echo "
  • {$contrib_username}
    • "; + echo '
  • ', $contrib_username, '
    • '; } } ?> @@ -530,9 +530,9 @@
    tested ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->tested ) ), $api->tested, '>' ) ) { - echo '

    ' . __('Warning: This plugin has not been tested with your current version of WordPress.') . '

    '; + echo '

    ', __( 'Warning: This plugin has not been tested with your current version of WordPress.' ), '

    '; } elseif ( ! empty( $api->requires ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->requires ) ), $api->requires, '<' ) ) { - echo '

    ' . __('Warning: This plugin has not been marked as compatible with your version of WordPress.') . '

    '; + echo '

    ', __( 'Warning: This plugin has not been marked as compatible with your version of WordPress.' ), '

    '; } foreach ( (array) $api->sections as $section_name => $content ) { @@ -543,32 +543,32 @@ $display = ( $section_name === $section ) ? 'block' : 'none'; - echo "\t
    \n"; - echo $content; - echo "\t
    \n"; + echo "\t", '
    \n", + $content, + "\t
    \n"; } - echo "
    \n"; - echo "
    \n"; - echo "
    \n"; // #plugin-information-scrollable - echo "\n", + "
    \n", + "\n", /* #plugin-information-scrollable */ + '
    \n"; if ( ! empty( $api->download_link ) && ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) ) { $status = install_plugin_install_status( $api ); switch ( $status['status'] ) { case 'install': if ( $status['url'] ) { - echo '' . __( 'Install Now' ) . ''; + echo '', __( 'Install Now' ), ''; } break; case 'update_available': if ( $status['url'] ) { - echo '' . __( 'Install Update Now' ) .''; + echo '', __( 'Install Update Now' ), ''; } break; case 'newer_installed': - echo '' . sprintf( __( 'Newer Version (%s) Installed'), $status['version'] ) . ''; + echo '', sprintf( __( 'Newer Version (%s) Installed'), $status['version'] ), ''; break; case 'latest_installed': - echo '' . __( 'Latest Version Installed' ) . ''; + echo '', __( 'Latest Version Installed' ), ''; break; } } Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-comments-list-table.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-comments-list-table.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-comments-list-table.php (working copy) @@ -263,7 +263,7 @@ ) ); foreach ( $comment_types as $type => $label ) - echo "\t" . '\n"; + echo "\t", '\n"; ?> ID ); } - echo '
    '; - echo $post_link . '
    '; + echo '
    ', + $post_link, '
    '; $this->comments_bubble( $post->ID, $pending_comments ); echo '     '; $post_type_object = get_post_type_object( $post->post_type ); - echo "" . $post_type_object->labels->view_item . ''; - echo '
    '; + echo '', $post_type_object->labels->view_item, '', + '
    '; if ( 'attachment' == $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) ) echo $thumb; } Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-links-list-table.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-links-list-table.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-links-list-table.php (working copy) @@ -79,7 +79,7 @@ 'orderby' => 'name', ); - echo ''; + echo ''; wp_dropdown_categories( $dropdown_options ); submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); ?> @@ -140,14 +140,14 @@ switch ( $column_name ) { case 'cb': ?> - + link_name ) ) . "'>$link->link_name
    "; + echo '', $link->link_name, "
    "; $actions = array(); $actions['edit'] = '' . __( 'Edit' ) . ''; @@ -157,7 +157,7 @@ echo ''; break; case 'url': - echo "link_name ) )."'>$short_url"; + echo '', $short_url, ""; break; case 'categories': ?>>'; - echo '

    '; - echo '' . __('Notice:') . ' '; + echo '

    ', + '

    ', + '', __( 'Notice:' ), ' '; _e('You’re using the auto-generated password for your account. Would you like to change it to something easier to remember?'); echo '

    '; printf( '' . __('Yes, take me to my profile page') . ' | ', get_edit_profile_url() . '#password' ); Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\file.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\file.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\file.php (working copy) @@ -1085,7 +1085,7 @@ $error_string = __('ERROR: There was an error connecting to the server, Please verify the settings are correct.'); if ( is_wp_error($error) ) $error_string = esc_html( $error->get_error_message() ); - echo '

    ' . $error_string . '

    '; + echo '

    ', $error_string, '

    '; } $types = array(); @@ -1189,7 +1189,7 @@ '; + echo ''; } ?>

    Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-upgrader-skins.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-upgrader-skins.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-upgrader-skins.php (working copy) @@ -62,8 +62,8 @@ return; } $this->done_header = true; - echo '

    '; - echo '

    ' . $this->options['title'] . '

    '; + echo '
    ', + '

    ', $this->options['title'], '

    '; } public function footer() { if ( $this->done_footer ) { @@ -169,7 +169,7 @@ public function after() { $this->plugin = $this->upgrader->plugin_info(); if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){ - echo ''; + echo ''; } $this->decrement_update_count( 'plugin' ); @@ -270,7 +270,7 @@ } $this->error = implode(', ', $messages); } - echo ''; + echo ''; } public function bulk_header() { @@ -284,8 +284,8 @@ public function before($title = '') { $this->in_loop = true; printf( '

    ' . $this->upgrader->strings['skin_before_update_header'] . '

    ', $title, $this->upgrader->update_current, $this->upgrader->update_count); - echo ''; - echo '

    '; + echo ''; + echo '

    '; $this->flush_output(); } @@ -293,16 +293,16 @@ echo '

    '; if ( $this->error || ! $this->result ) { if ( $this->error ) - echo '

    ' . sprintf($this->upgrader->strings['skin_update_failed_error'], $title, $this->error) . '

    '; + echo '

    ', sprintf( $this->upgrader->strings['skin_update_failed_error'], $title, $this->error ), '

    '; else - echo '

    ' . sprintf($this->upgrader->strings['skin_update_failed'], $title) . '

    '; + echo '

    ', sprintf( $this->upgrader->strings['skin_update_failed'], $title ), '

    '; - echo ''; + echo ''; } if ( $this->result && ! is_wp_error( $this->result ) ) { if ( ! $this->error ) - echo '

    ' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '

    '; - echo ''; + echo '

    ', sprintf( $this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js( $this->upgrader->update_current ) . '\').toggle();jQuery(\'span\', this).toggle(); return false;' ), '

    '; + echo ''; } $this->reset(); Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\misc.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\misc.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\misc.php (working copy) @@ -665,7 +665,7 @@ $icon_colors = array( 'base' => '#999', 'focus' => '#00a0d2', 'current' => '#fff' ); } - echo '\n"; + echo '\n"; } add_action( 'admin_head', 'wp_color_scheme_settings' ); Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-importer.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-importer.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-importer.php (working copy) @@ -210,7 +210,7 @@ public function is_user_over_quota() { if ( function_exists( 'upload_is_user_over_quota' ) ) { if ( upload_is_user_over_quota() ) { - echo "Sorry, you have used your upload quota.\n"; + echo __( 'Sorry, you have used your upload quota.' ), "\n"; return true; } } Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\meta-boxes.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\meta-boxes.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\meta-boxes.php (working copy) @@ -187,8 +187,8 @@
    0 && $revisions_to_keep <= $args['args']['revisions_count'] ) { - echo ''; + echo ''; printf( __( 'Revisions: %s' ), '' . number_format_i18n( $args['args']['revisions_count'] ) . '+' ); echo ''; } else { @@ -319,10 +319,10 @@ ID ) ) if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) { - echo "" . __( 'Trash' ) . ""; + echo '', __( 'Trash' ), ''; } else { $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : ''; - echo "" . __( 'Delete Permanently' ) . ""; + echo '', __( 'Delete Permanently' ), ''; } ?>
    @@ -479,7 +479,7 @@
    "; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks. + echo ''; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks. ?>
      ID, array( 'taxonomy' => $tax_name, 'popular_cats' => $popular_ids ) ); ?> @@ -634,7 +634,7 @@ $wp_list_table->display( true ); if ( 1 > $total ) { - echo '

      ' . __('No comments yet.') . '

      '; + echo '

      ', __( 'No comments yet.' ), '

      '; } else { $hidden = get_hidden_meta_boxes( get_current_screen() ); if ( ! in_array('commentsdiv', $hidden) ) { @@ -1083,10 +1083,10 @@   Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\theme-install.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\theme-install.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\theme-install.php (working copy) @@ -55,7 +55,7 @@ $type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term'; $term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : ''; if ( ! $type_selector ) - echo '

      ' . __( 'Search for themes by keyword.' ) . '

      '; + echo '

      ', __( 'Search for themes by keyword.' ), '

      '; ?>
      @@ -107,9 +107,9 @@ foreach ( (array) $feature_list as $feature_name => $features ) { $feature_name = esc_html( $feature_name ); - echo '
      ' . $feature_name . '
      '; + echo '
      ', $feature_name, '
      ', + '
        '; - echo '
          '; foreach ( $features as $feature => $feature_name ) { $feature_name = esc_html( $feature_name ); $feature = esc_attr($feature); Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\export.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\export.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\export.php (working copy) @@ -166,7 +166,7 @@ if ( empty( $category->name ) ) return; - echo '' . wxr_cdata( $category->name ) . ''; + echo '', wxr_cdata( $category->name ), ''; } /** @@ -180,7 +180,7 @@ if ( empty( $category->description ) ) return; - echo '' . wxr_cdata( $category->description ) . ''; + echo '', wxr_cdata( $category->description ), ''; } /** @@ -194,7 +194,7 @@ if ( empty( $tag->name ) ) return; - echo '' . wxr_cdata( $tag->name ) . ''; + echo '', wxr_cdata( $tag->name ), ''; } /** @@ -208,7 +208,7 @@ if ( empty( $tag->description ) ) return; - echo '' . wxr_cdata( $tag->description ) . ''; + echo '', wxr_cdata( $tag->description ), ''; } /** @@ -222,7 +222,7 @@ if ( empty( $term->name ) ) return; - echo '' . wxr_cdata( $term->name ) . ''; + echo '', wxr_cdata( $term->name ), ''; } /** @@ -236,7 +236,7 @@ if ( empty( $term->description ) ) return; - echo '' . wxr_cdata( $term->description ) . ''; + echo '', wxr_cdata( $term->description ), ''; } /** @@ -264,14 +264,14 @@ $authors = array_filter( $authors ); foreach ( $authors as $author ) { - echo "\t"; - echo '' . $author->ID . ''; - echo '' . $author->user_login . ''; - echo '' . $author->user_email . ''; - echo '' . wxr_cdata( $author->display_name ) . ''; - echo '' . wxr_cdata( $author->user_firstname ) . ''; - echo '' . wxr_cdata( $author->user_lastname ) . ''; - echo "\n"; + echo "\t", + '', $author->ID, '', + '', $author->user_login, '', + '', $author->user_email, '', + '', wxr_cdata( $author->display_name ), '', + '', wxr_cdata( $author->user_firstname ), '', + '', wxr_cdata( $author->user_lastname ), '', + "\n"; } } @@ -286,7 +286,7 @@ return; foreach ( $nav_menus as $menu ) { - echo "\t{$menu->term_id}nav_menu{$menu->slug}"; + echo "\t", '', $menu->term_id, 'nav_menu', $menu->slug, ''; wxr_term_name( $menu ); echo "\n"; } @@ -306,7 +306,7 @@ $terms = wp_get_object_terms( $post->ID, $taxonomies ); foreach ( (array) $terms as $term ) { - echo "\t\ttaxonomy}\" nicename=\"{$term->slug}\">" . wxr_cdata( $term->name ) . "\n"; + echo "\t\t", '', wxr_cdata( $term->name ), "\n"; } } @@ -317,7 +317,7 @@ } add_filter( 'wxr_export_skip_postmeta', 'wxr_filter_postmeta', 10, 2 ); - echo '\n"; + echo '\n"; ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-plugin-install-list-table.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-plugin-install-list-table.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-plugin-install-list-table.php (working copy) @@ -205,7 +205,7 @@ } else { $message = __( 'No plugins match your request.' ); } - echo '
          ' . $message . '
          '; + echo '
          ', $message, '
          '; } protected function get_views() { @@ -240,7 +240,7 @@ foreach ( $views as $class => $view ) { $views[ $class ] = "\t
        1. $view"; } - echo implode( "
          2. \n", $views ) . "\n"; + echo implode( " \n", $views ), "\n"; } ?>
    @@ -378,7 +378,7 @@ echo '
    '; } - echo '

    ' . esc_html( $group_name ) . '

    '; + echo '

    ', esc_html( $group_name ), '

    '; // needs an extra wrapping div for nth-child selectors to work echo '
    '; @@ -462,7 +462,7 @@
  • ' . implode( '
  • ', $action_links ) . '
    • '; + echo '
    • ', implode( '
    • ', $action_links ), '
    '; } ?>
    @@ -494,11 +494,11 @@
    ' ) ) { - echo '' . __( 'Untested with your version of WordPress' ) . ''; + echo '', __( 'Untested with your version of WordPress' ), ''; } elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) { - echo '' . __( 'Incompatible with your version of WordPress' ) . ''; + echo '', __( 'Incompatible with your version of WordPress' ), ''; } else { - echo '' . __( 'Compatible with your version of WordPress' ) . ''; + echo '', __( 'Compatible with your version of WordPress' ), ''; } ?>
    Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\nav-menu.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\nav-menu.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\nav-menu.php (working copy) @@ -637,7 +637,7 @@ $get_posts = new WP_Query; $posts = $get_posts->query( $args ); if ( ! $get_posts->post_count ) { - echo '

    ' . __( 'No items.' ) . '

    '; + echo '

    ', __( 'No items.' ), '

    '; return; } @@ -877,7 +877,7 @@ $terms = get_terms( $taxonomy_name, $args ); if ( ! $terms || is_wp_error($terms) ) { - echo '

    ' . __( 'No items.' ) . '

    '; + echo '

    ', __( 'No items.' ), '

    '; return; } Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-ms-users-list-table.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-ms-users-list-table.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-ms-users-list-table.php (working copy) @@ -178,7 +178,7 @@ switch ( $column_name ) { case 'cb': ?> - + "; ?> user_login; ?>user_login, $super_admins ) ) - echo ' - ' . __( 'Super Admin' ); + echo ' - ', __( 'Super Admin' ); ?>
    " . mysql2date( $date, $user->user_registered ) . ""; + echo '', mysql2date( $date, $user->user_registered ), ''; break; case 'blogs': @@ -245,9 +245,9 @@ continue; $path = ( $val->path == '/' ) ? '' : $val->path; - echo ''; - echo '' . str_replace( '.' . get_current_site()->domain, '', $val->domain . $path ) . ''; - echo ' '; + echo '', + '', str_replace( '.' . get_current_site()->domain, '', $val->domain . $path ), '', + ' '; $actions = array(); $actions['edit'] = '' . __( 'Edit' ) . ''; Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\update.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\update.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\update.php (working copy) @@ -279,7 +279,7 @@ if ( is_network_admin() || !is_multisite() ) { $active_class = ( is_plugin_active( $plugin_data['plugin'] ) ) ? ' active' : ''; - echo '
    '; + echo '
    '; if ( ! current_user_can( 'update_plugins' ) ) { printf( __('There is a new version of %1$s available. View version %4$s details.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); @@ -369,7 +369,7 @@ $wp_list_table = _get_list_table('WP_MS_Themes_List_Table'); - echo '
    '; + echo '
    '; if ( ! current_user_can('update_themes') ) { printf( __('There is a new version of %1$s available. View version %4$s details.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r->new_version ); } elseif ( empty( $r['package'] ) ) { Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-theme-install-list-table.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-theme-install-list-table.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\class-wp-theme-install-list-table.php (working copy) @@ -359,15 +359,15 @@
    slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . ''; + echo '', __( 'Update' ), ''; break; case 'newer_installed': case 'latest_installed': - echo '' . _x( 'Installed', 'theme' ) . ''; + echo '', _x( 'Installed', 'theme' ), ''; break; case 'install': default: - echo '' . __( 'Install' ) . ''; + echo '', __( 'Install' ), ''; break; } ?>

    Index: I:\000_WP_SVN\wp-core\src\wp-admin\includes\media.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\includes\media.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\includes\media.php (working copy) @@ -92,7 +92,7 @@ $href = add_query_arg(array('tab' => $callback, 's' => false, 'paged' => false, 'post_mime_type' => false, 'm' => false)); $link = "$text"; - echo "\t
  • $link
    • \n"; + echo "\t", '
  • ', $link, "
    • \n"; } echo "\n"; } @@ -1715,7 +1715,7 @@ */ function media_upload_header() { $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0; - echo '\n"; + echo '\n"; if ( empty( $_GET['chromeless'] ) ) { echo '
    '; the_media_upload_tabs(); @@ -1734,7 +1734,7 @@ global $type, $tab, $is_IE, $is_opera; if ( ! _device_can_upload() ) { - echo '

    ' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead.'), 'https://apps.wordpress.org/' ) . '

    '; + echo '

    ', sprintf( __( 'The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead.' ), 'https://apps.wordpress.org/' ), '

    '; return; } @@ -1967,7 +1967,7 @@ add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2); echo get_media_items( $id, $errors ); } else { - echo '
    '.esc_html($id->get_error_message()).'
    '; + echo '
    ', esc_html( $id->get_error_message() ), '
    '; exit; } } @@ -2358,7 +2358,7 @@ * * @param array $type_links An array of list items containing mime type link HTML. */ -echo implode(' | ', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . ''; +echo implode( ' | ', apply_filters( 'media_upload_mime_type_links', $type_links ) ), ''; unset($type_links); ?> @@ -2403,9 +2403,9 @@ else $default = ''; - echo ""; - echo esc_html( $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear" ); - echo "\n"; + echo '', + esc_html( $wp_locale->get_month( $arc_row->mmonth ), " $arc_row->yyear" ), + "\n"; } ?> @@ -2624,7 +2624,7 @@ * @since 3.5.0 */ function multisite_over_quota_message() { - echo '

    ' . sprintf( __( 'Sorry, you have used all of your storage quota of %s MB.' ), get_space_allowed() ) . '

    '; + echo '

    ', sprintf( __( 'Sorry, you have used all of your storage quota of %s MB.' ), get_space_allowed() ), '

    '; } /** @@ -2723,15 +2723,15 @@ post_content, 'attachment_content', $editor_args ); ?>
    ID ); - echo $extras['item']; - echo '' . "\n"; + echo $extras['item'], + '', "\n"; } /** @@ -2767,7 +2767,7 @@ list( $mime_type ) = explode( '/', $post->post_mime_type ); if ( $mime_type !== 'image' && ! empty( $meta['mime_type'] ) ) { if ( $meta['mime_type'] !== "$mime_type/" . strtolower( $matches[1] ) ) { - echo ' (' . $meta['mime_type'] . ')'; + echo ' (', $meta['mime_type'], ')'; } } } else { @@ -2818,9 +2818,9 @@ '; + echo ''; if ( ! empty( $_REQUEST['order'] ) ) - echo ''; + echo ''; if ( ! empty( $_REQUEST['post_mime_type'] ) ) - echo ''; + echo ''; if ( ! empty( $_REQUEST['detached'] ) ) - echo ''; + echo ''; ?>

    @@ -378,12 +378,12 @@ if ( empty( $views ) ) return; - echo "

      \n"; + echo '
        ', "\n"; foreach ( $views as $class => $view ) { $views[ $class ] = "\t
      • $view"; } - echo implode( " |
        • \n", $views ) . "\n"; - echo "
      "; + echo implode( " |\n", $views ), "\n", + '
    '; } /** @@ -433,14 +433,14 @@ if ( empty( $this->_actions ) ) return; - echo ""; - echo "\n", + '\n"; foreach ( $this->_actions as $name => $title ) { $class = 'edit' == $name ? ' class="hide-if-no-js"' : ''; - echo "\t\n"; + echo "\t", '\n"; } echo "\n"; @@ -612,7 +612,7 @@ if ( $pending_comments ) echo ''; - echo "" . number_format_i18n( get_comments_number() ) . ""; + echo '', number_format_i18n( get_comments_number() ), ""; if ( $pending_comments ) echo ''; @@ -1015,7 +1015,7 @@ if ( $this->has_items() ) { $this->display_rows(); } else { - echo ''; + echo ''; $this->no_items(); echo ''; } @@ -1076,14 +1076,14 @@ echo ''; } elseif ( method_exists( $this, 'column_' . $column_name ) ) { - echo ""; - echo call_user_func( array( $this, 'column_' . $column_name ), $item ); - echo ""; + echo '', + call_user_func( array( $this, 'column_' . $column_name ), $item ), + ''; } else { - echo ""; - echo $this->column_default( $item, $column_name ); - echo ""; + echo '', + $this->column_default( $item, $column_name ), + ''; } } } Index: I:\000_WP_SVN\wp-core\src\wp-admin\maint\repair.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\maint\repair.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\maint\repair.php (working copy) @@ -27,7 +27,7 @@ ' . __( '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.' ) . "

    define('WP_ALLOW_REPAIR', true);

    "; + echo '

    ', __( '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.' ), '

    define( \'WP_ALLOW_REPAIR\', true);

    '; } elseif ( isset( $_GET['repair'] ) ) { $optimize = 2 == $_GET['repair']; $okay = true; @@ -70,7 +70,7 @@ printf( __( 'Successfully repaired the %s table.' ), "$table" ); } else { /* translators: 1: table name, 2: error message, */ - echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), "$table", "$check->Msg_text" ) . '
    '; + echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), "$table", "$check->Msg_text" ), '
    '; $problems[$table] = $check->Msg_text; $okay = false; } @@ -104,15 +104,15 @@ $problem_output = ''; foreach ( $problems as $table => $problem ) $problem_output .= "$table: $problem\n"; - echo '

    '; + echo '

    '; } else { - echo '

    ' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "

    define('WP_ALLOW_REPAIR', true);

    "; + echo '

    ', __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ), '

    define( \'WP_ALLOW_REPAIR\', true );

    '; } } else { if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] ) - echo '

    ' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the “Repair Database” button. Repairing can take a while, so please be patient.' ) . '

    '; + echo '

    ', __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the “Repair Database” button. Repairing can take a while, so please be patient.' ), '

    '; else - echo '

    ' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '

    '; + echo '

    ', __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ), '

    '; ?>

    Index: I:\000_WP_SVN\wp-core\src\wp-admin\network\site-info.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\network\site-info.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\network\site-info.php (working copy) @@ -110,14 +110,14 @@ ); foreach ( $tabs as $tab_id => $tab ) { $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; - echo '' . esc_html( $tab['label'] ) . ''; + echo '', esc_html( $tab['label'] ), ''; } ?>

    ' . $msg . '

    '; + echo '

    ', $msg, '

    '; } ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\network\user-new.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\network\user-new.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\network\user-new.php (working copy) @@ -73,7 +73,7 @@

    ' . $msg . '

    '; + echo '

    ', $msg, '

    '; } if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\network\site-themes.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\network\site-themes.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\network\site-themes.php (working copy) @@ -150,7 +150,7 @@ ); foreach ( $tabs as $tab_id => $tab ) { $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; - echo '' . esc_html( $tab['label'] ) . ''; + echo '', esc_html( $tab['label'] ), ''; } ?>

    ' . sprintf( $message, number_format_i18n( $enabled ) ) . '

    '; + echo '

    ', sprintf( $message, number_format_i18n( $enabled ) ), '

    '; } elseif ( isset( $_GET['disabled'] ) ) { $disabled = absint( $_GET['disabled'] ); if ( 1 == $disabled ) { @@ -170,9 +170,9 @@ } else { $message = _n( '%s theme disabled.', '%s themes disabled.', $disabled ); } - echo '

    ' . sprintf( $message, number_format_i18n( $disabled ) ) . '

    '; + echo '

    ', sprintf( $message, number_format_i18n( $disabled ) ), '

    '; } elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) { - echo '

    ' . __( 'No theme selected.' ) . '

    '; + echo '

    ', __( 'No theme selected.' ), '

    '; } ?>

    Index: I:\000_WP_SVN\wp-core\src\wp-admin\network\site-new.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\network\site-new.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\network\site-new.php (working copy) @@ -134,7 +134,7 @@

    ' . $msg . '

    '; + echo '

    ', $msg, '

    '; } ?> @@ -145,9 +145,9 @@ .domain ); ?> domain . $current_site->path ?> + echo $current_site->domain, $current_site->path; ?> ' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '

    '; + echo '

    ', __( 'Only lowercase letters (a-z) and numbers are allowed.' ), '

    '; ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\network\themes.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\network\themes.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\network\themes.php (working copy) @@ -85,14 +85,14 @@ require_once(ABSPATH . 'wp-admin/admin-header.php'); - echo '
    '; - echo '

    ' . esc_html( $title ) . '

    '; + echo '
    ', + '

    ', esc_html( $title ), '

    '; $url = self_admin_url('update.php?action=update-selected-themes&themes=' . urlencode( join(',', $themes) )); $url = wp_nonce_url($url, 'bulk-update-themes'); - echo ""; - echo '
    '; + echo '', + '
    '; require_once(ABSPATH . 'wp-admin/admin-footer.php'); exit; case 'delete-selected': @@ -176,7 +176,7 @@ '; + echo ''; } wp_nonce_field( 'bulk-themes' ); @@ -200,7 +200,7 @@
      ' . esc_html( str_replace( WP_CONTENT_DIR . '/themes', '', $file ) ) . ''; + echo '
    • ', esc_html( str_replace( WP_CONTENT_DIR . '/themes', '', $file ) ), '
      • '; } ?>
    @@ -274,7 +274,7 @@ } else { $message = _n( '%s theme enabled.', '%s themes enabled.', $enabled ); } - echo '

    ' . sprintf( $message, number_format_i18n( $enabled ) ) . '

    '; + echo '

    ', sprintf( $message, number_format_i18n( $enabled ) ), '

    '; } elseif ( isset( $_GET['disabled'] ) ) { $disabled = absint( $_GET['disabled'] ); if ( 1 == $disabled ) { @@ -282,7 +282,7 @@ } else { $message = _n( '%s theme disabled.', '%s themes disabled.', $disabled ); } - echo '

    ' . sprintf( $message, number_format_i18n( $disabled ) ) . '

    '; + echo '

    ', sprintf( $message, number_format_i18n( $disabled ) ), '

    '; } elseif ( isset( $_GET['deleted'] ) ) { $deleted = absint( $_GET['deleted'] ); if ( 1 == $deleted ) { @@ -290,11 +290,11 @@ } else { $message = _n( '%s theme deleted.', '%s themes deleted.', $deleted ); } - echo '

    ' . sprintf( $message, number_format_i18n( $deleted ) ) . '

    '; + echo '

    ', sprintf( $message, number_format_i18n( $deleted ) ), '

    '; } elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) { - echo '

    ' . __( 'No theme selected.' ) . '

    '; + echo '

    ', __( 'No theme selected.' ), '

    '; } elseif ( isset( $_GET['error'] ) && 'main' == $_GET['error'] ) { - echo '

    ' . __( 'You cannot delete a theme while it is active on the main site.' ) . '

    '; + echo '

    ', __( 'You cannot delete a theme while it is active on the main site.' ), '

    '; } ?> @@ -307,7 +307,7 @@ $wp_list_table->views(); if ( 'broken' == $status ) - echo '

    ' . __('The following themes are installed but incomplete. Themes must have a stylesheet and a template.') . '

    '; + echo '

    ', __( 'The following themes are installed but incomplete. Themes must have a stylesheet and a template.' ), '

    '; ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\network\site-settings.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\network\site-settings.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\network\site-settings.php (working copy) @@ -98,14 +98,14 @@ ); foreach ( $tabs as $tab_id => $tab ) { $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; - echo '' . esc_html( $tab['label'] ) . ''; + echo '', esc_html( $tab['label'] ), ''; } ?>

    ' . $msg . '

    '; + echo '

    ', $msg, '

    '; } ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\network\upgrade.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\network\upgrade.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\network\upgrade.php (working copy) @@ -39,7 +39,7 @@ wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) ); echo '
    '; -echo '

    ' . __( 'Upgrade Network' ) . '

    '; +echo '

    ', __( 'Upgrade Network' ), '

    '; $action = isset($_GET['action']) ? $_GET['action'] : 'show'; @@ -54,7 +54,7 @@ $blogs = $wpdb->get_results( "SELECT blog_id FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY registered DESC LIMIT {$n}, 5", ARRAY_A ); if ( empty( $blogs ) ) { - echo '

    ' . __( 'All done!' ) . '

    '; + echo '

    ', __( 'All done!' ), '

    '; break; } echo "
      "; Index: I:\000_WP_SVN\wp-core\src\wp-admin\network\settings.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\network\settings.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\network\settings.php (working copy) @@ -158,7 +158,7 @@
      ' . __( 'If registration is disabled, please set NOBLOGREDIRECT in wp-config.php to a URL you will redirect visitors to if they visit a non-existent site.' ) . '

      '; + echo '

      ', __( 'If registration is disabled, please set NOBLOGREDIRECT in wp-config.php to a URL you will redirect visitors to if they visit a non-existent site.' ), '

      '; } ?> @@ -379,11 +379,11 @@ $menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) ); $fieldset_end = ''; if ( count( (array) $menu_items ) > 1 ) { - echo '
      ' . __( 'Enable menus' ) . ''; + echo '
      ', __( 'Enable menus' ), ''; $fieldset_end = '
      '; } foreach ( (array) $menu_items as $key => $val ) { - echo "
      "; + echo '
      '; } echo $fieldset_end; ?> Index: I:\000_WP_SVN\wp-core\src\wp-admin\network\site-users.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-admin\network\site-users.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-admin\network\site-users.php (working copy) @@ -193,43 +193,43 @@ ); foreach ( $tabs as $tab_id => $tab ) { $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; - echo '' . esc_html( $tab['label'] ) . ''; + echo '', esc_html( $tab['label'] ), ''; } ?>

      ' . __( 'User added.' ) . '

    '; - break; - case 'err_add_member': - echo '

    ' . __( 'User is already a member of this site.' ) . '

    '; - break; - case 'err_add_notfound': - echo '

    ' . __( 'Enter the username of an existing user.' ) . '

    '; - break; - case 'promote': - echo '

    ' . __( 'Changed roles.' ) . '

    '; - break; - case 'err_promote': - echo '

    ' . __( 'Select a user to change role.' ) . '

    '; - break; - case 'remove': - echo '

    ' . __( 'User removed from this site.' ) . '

    '; - break; - case 'err_remove': - echo '

    ' . __( 'Select a user to remove.' ) . '

    '; - break; - case 'newuser': - echo '

    ' . __( 'User created.' ) . '

    '; - break; - case 'err_new': - echo '

    ' . __( 'Enter the username and email.' ) . '

    '; - break; - case 'err_new_dup': - echo '

    ' . __( 'Duplicated username or email address.' ) . '

    '; - break; + case 'adduser': + echo '

    ', __( 'User added.' ), '

    '; + break; + case 'err_add_member': + echo '

    ', __( 'User is already a member of this site.' ), '

    '; + break; + case 'err_add_notfound': + echo '

    ', __( 'Enter the username of an existing user.' ), '

    '; + break; + case 'promote': + echo '

    ', __( 'Changed roles.' ), '

    '; + break; + case 'err_promote': + echo '

    ', __( 'Select a user to change role.' ), '

    '; + break; + case 'remove': + echo '

    ', __( 'User removed from this site.' ), '

    '; + break; + case 'err_remove': + echo '

    ', __( 'Select a user to remove.' ), '

    '; + break; + case 'newuser': + echo '

    ', __( 'User created.' ), '

    '; + break; + case 'err_new': + echo '

    ', __( 'Enter the username and email.' ), '

    '; + break; + case 'err_new_dup': + echo '

    ', __( 'Duplicated username or email address.' ), '

    '; + break; } endif; ?> Index: I:\000_WP_SVN\wp-core\src\wp-content\themes\twentyeleven\functions.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-content\themes\twentyeleven\functions.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-content\themes\twentyeleven\functions.php (working copy) @@ -581,7 +581,7 @@ } if ( $class ) - echo 'class="' . esc_attr( $class ) . '"'; + echo 'class="', esc_attr( $class ), '"'; } if ( ! function_exists( 'twentyeleven_comment' ) ) : Index: I:\000_WP_SVN\wp-core\src\wp-content\themes\twentyfourteen\inc\template-tags.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-content\themes\twentyfourteen\inc\template-tags.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-content\themes\twentyfourteen\inc\template-tags.php (working copy) @@ -106,7 +106,7 @@ */ function twentyfourteen_posted_on() { if ( is_sticky() && is_home() && ! is_paged() ) { - echo '' . __( 'Sticky', 'twentyfourteen' ) . ''; + echo '', __( 'Sticky', 'twentyfourteen' ), ''; } // Set up and print post meta information. Index: I:\000_WP_SVN\wp-core\src\wp-content\themes\twentyten\category.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-content\themes\twentyten\category.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-content\themes\twentyten\category.php (working copy) @@ -18,7 +18,7 @@ ' . $category_description . '
    '; + echo '
    ', $category_description, '
    '; /* * Run the loop for the category page to output the posts. Index: I:\000_WP_SVN\wp-core\src\wp-content\themes\twentythirteen\functions.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-content\themes\twentythirteen\functions.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-content\themes\twentythirteen\functions.php (working copy) @@ -319,7 +319,7 @@ */ function twentythirteen_entry_meta() { if ( is_sticky() && is_home() && ! is_paged() ) - echo '' . esc_html__( 'Sticky', 'twentythirteen' ) . ''; + echo '', esc_html__( 'Sticky', 'twentythirteen' ), ''; if ( ! has_post_format( 'link' ) && 'post' == get_post_type() ) twentythirteen_entry_date(); @@ -327,13 +327,13 @@ // Translators: used between list items, there is a space after the comma. $categories_list = get_the_category_list( __( ', ', 'twentythirteen' ) ); if ( $categories_list ) { - echo '' . $categories_list . ''; + echo '', $categories_list, ''; } // Translators: used between list items, there is a space after the comma. $tag_list = get_the_tag_list( '', __( ', ', 'twentythirteen' ) ); if ( $tag_list ) { - echo '' . $tag_list . ''; + echo '', $tag_list, ''; } // Post author Index: I:\000_WP_SVN\wp-core\src\wp-content\themes\twentythirteen\inc\custom-header.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-content\themes\twentythirteen\inc\custom-header.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-content\themes\twentythirteen\inc\custom-header.php (working copy) @@ -160,7 +160,7 @@ box-sizing: border-box; padding: 0 20px; } Index: I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-ajax-response.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-ajax-response.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-ajax-response.php (working copy) @@ -133,7 +133,7 @@ */ public function send() { header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) ); - echo ""; + echo ''; foreach ( (array) $this->responses as $response ) echo $response; echo ''; Index: I:\000_WP_SVN\wp-core\src\wp-includes\class-IXR.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\class-IXR.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\class-IXR.php (working copy) @@ -704,7 +704,7 @@ // Now send the request if ($this->debug) { - echo '
    '.htmlspecialchars($request)."\n
    \n\n"; + echo '
    ', htmlspecialchars( $request ), "\n
    \n\n"; } if ($this->timeout) { @@ -743,7 +743,7 @@ } } if ($this->debug) { - echo '
    '.htmlspecialchars($debugContents)."\n
    \n\n"; + echo '
    ', htmlspecialchars( $debugContents ), "\n
    \n\n"; } // Now parse what we've got back Index: I:\000_WP_SVN\wp-core\src\wp-includes\deprecated.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\deprecated.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\deprecated.php (working copy) @@ -1060,7 +1060,7 @@ // Handle each category. // Display the category name - echo '

  • ' . apply_filters('link_category', $cat->name ) . "

    \n\t
      \n"; + echo '

    • ', apply_filters('link_category', $cat->name ), "

      \n\t
        \n"; // Call get_links() with all the appropriate params get_links($cat->term_id, '
      • ', "
        • ", "\n", true, 'name', false); Index: I:\000_WP_SVN\wp-core\src\wp-includes\default-widgets.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\default-widgets.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\default-widgets.php (working copy) @@ -56,7 +56,7 @@ if ( ! empty( $out ) ) { echo $args['before_widget']; if ( $title ) { - echo $args['before_title'] . $title . $args['after_title']; + echo $args['before_title'], $title, $args['after_title']; } ?>
          @@ -183,9 +183,9 @@ term_id ) . '"' - . selected( $instance['category'], $link_cat->term_id, false ) - . '>' . $link_cat->name . "\n"; + echo '\n"; } ?> @@ -234,7 +234,7 @@ echo $args['before_widget']; if ( $title ) { - echo $args['before_title'] . $title . $args['after_title']; + echo $args['before_title'], $title, $args['after_title']; } // Use current theme search form if it exists @@ -281,7 +281,7 @@ echo $args['before_widget']; if ( $title ) { - echo $args['before_title'] . $title . $args['after_title']; + echo $args['before_title'], $title, $args['after_title']; } if ( $d ) { @@ -401,7 +401,7 @@ echo $args['before_widget']; if ( $title ) { - echo $args['before_title'] . $title . $args['after_title']; + echo $args['before_title'], $title, $args['after_title']; } ?>
            @@ -465,7 +465,7 @@ echo $args['before_widget']; if ( $title ) { - echo $args['before_title'] . $title . $args['after_title']; + echo $args['before_title'], $title, $args['after_title']; } echo '
            '; get_calendar(); @@ -519,7 +519,7 @@ $text = apply_filters( 'widget_text', empty( $instance['text'] ) ? '' : $instance['text'], $instance ); echo $args['before_widget']; if ( ! empty( $title ) ) { - echo $args['before_title'] . $title . $args['after_title']; + echo $args['before_title'], $title, $args['after_title']; } ?>
            id_base}-dropdown-{$this->number}"; $first_dropdown = false; - echo ''; + echo ''; $cat_args['show_option_none'] = __( 'Select Category' ); $cat_args['id'] = $dropdown_id; @@ -746,7 +746,7 @@ ?>
              have_posts() ) : $r->the_post(); ?> @@ -1009,7 +1009,7 @@ echo $args['before_widget']; if ( $title ) { - echo $args['before_title'] . $title . $args['after_title']; + echo $args['before_title'], $title, $args['after_title']; } wp_widget_rss_output( $rss, $instance ); echo $args['after_widget']; @@ -1054,7 +1054,7 @@ if ( is_wp_error($rss) ) { if ( is_admin() || current_user_can('manage_options') ) - echo '

              ' . sprintf( __('RSS Error: %s'), $rss->get_error_message() ) . '

              '; + echo '

              ', sprintf( __( 'RSS Error: %s' ), $rss->get_error_message() ), '

              '; return; } @@ -1069,7 +1069,7 @@ $show_date = (int) $args['show_date']; if ( !$rss->get_item_quantity() ) { - echo '
              • ' . __( 'An error has occurred, which probably means the feed is down. Try again later.' ) . '
              '; + echo '
              • ', __( 'An error has occurred, which probably means the feed is down. Try again later.' ), '
              '; $rss->__destruct(); unset($rss); return; @@ -1164,7 +1164,7 @@ $args['show_date'] = isset( $args['show_date'] ) ? (int) $args['show_date'] : (int) $inputs['show_date']; if ( ! empty( $args['error'] ) ) { - echo '

              ' . sprintf( __( 'RSS Error: %s' ), $args['error'] ) . '

              '; + echo '

              ', sprintf( __( 'RSS Error: %s' ), $args['error'] ), '

              '; } if ( $inputs['url'] ) : @@ -1179,7 +1179,7 @@

              @@ -1279,7 +1279,7 @@ echo $args['before_widget']; if ( $title ) { - echo $args['before_title'] . $title . $args['after_title']; + echo $args['before_title'], $title, $args['after_title']; } echo '
              '; @@ -1358,7 +1358,7 @@ echo $args['before_widget']; if ( !empty($instance['title']) ) - echo $args['before_title'] . $instance['title'] . $args['after_title']; + echo $args['before_title'], $instance['title'], $args['after_title']; $nav_menu_args = array( 'fallback_cb' => '', @@ -1404,7 +1404,7 @@ // If no menus exists, direct the user to go and create some. if ( !$menus ) { - echo '

              '. sprintf( __('No menus have been created yet. Create some.'), admin_url('nav-menus.php') ) .'

              '; + echo '

              ', sprintf( __( 'No menus have been created yet. Create some.' ), admin_url( 'nav-menus.php' ) ), '

              '; return; } ?> @@ -1418,9 +1418,9 @@ term_id . '"' - . selected( $nav_menu, $menu->term_id, false ) - . '>'. esc_html( $menu->name ) . ''; + echo ''; } ?> Index: I:\000_WP_SVN\wp-core\src\wp-includes\wp-db.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\wp-db.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\wp-db.php (working copy) @@ -1293,10 +1293,10 @@ $str = htmlspecialchars( $str, ENT_QUOTES ); $query = htmlspecialchars( $this->last_query, ENT_QUOTES ); - print "
              -

              WordPress database error: [$str]
              - $query

              -
              "; + echo '
              +

              ', __( 'WordPress database error:' ), ' [', $str, ']
              + ', $query. '

              +
              '; } } Index: I:\000_WP_SVN\wp-core\src\wp-includes\feed-rdf.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\feed-rdf.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\feed-rdf.php (working copy) @@ -8,7 +8,7 @@ header('Content-Type: ' . feed_content_type('rdf') . '; charset=' . get_option('blog_charset'), true); $more = 1; -echo ''; +echo ''; /** This action is documented in wp-includes/feed-rss2.php */ do_action( 'rss_tag_pre', 'rdf' ); Index: I:\000_WP_SVN\wp-core\src\wp-includes\taxonomy.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\taxonomy.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\taxonomy.php (working copy) @@ -4447,7 +4447,7 @@ $r = wp_parse_args( $args, $defaults ); - echo $r['before'] . join( $r['sep'], get_the_taxonomies( $r['post'], $r ) ) . $r['after']; + echo $r['before'], join( $r['sep'], get_the_taxonomies( $r['post'], $r ) ), $r['after']; } /** Index: I:\000_WP_SVN\wp-core\src\wp-includes\feed-rss2-comments.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\feed-rss2-comments.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\feed-rss2-comments.php (working copy) @@ -7,7 +7,7 @@ header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_option('blog_charset'), true); -echo ''; +echo ''; /** This action is documented in wp-includes/feed-rss2.php */ do_action( 'rss_tag_pre', 'rss2-comments' ); Index: I:\000_WP_SVN\wp-core\src\wp-includes\script-loader.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\script-loader.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\script-loader.php (working copy) @@ -897,7 +897,7 @@ $concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat ); $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&" . $concat . '&ver=' . $wp_scripts->default_version; - echo "\n"; + echo '\n"; } if ( !empty($wp_scripts->print_html) ) @@ -1044,12 +1044,10 @@ $dir = $wp_styles->text_direction; $ver = $wp_styles->default_version; $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&load=" . trim($wp_styles->concat, ', ') . '&ver=' . $ver; - echo "\n"; + echo '', "\n"; if ( !empty($wp_styles->print_code) ) { - echo "\n"; + echo '\n"; } } Index: I:\000_WP_SVN\wp-core\src\wp-includes\ms-deprecated.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\ms-deprecated.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\ms-deprecated.php (working copy) @@ -215,7 +215,7 @@ reset( $most_active ); foreach ( (array) $most_active as $key => $details ) { $url = esc_url('http://' . $details['domain'] . $details['path']); - echo '
            • ' . $details['postcount'] . " $url
              • "; + echo '
            • ', $details['postcount'], ' ', $url, '
              • '; } } } Index: I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-editor.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-editor.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-editor.php (working copy) @@ -188,7 +188,7 @@ $wrap_class .= ' has-dfw'; } - echo '
              '; + echo '
              '; if ( self::$editor_buttons_css ) { wp_print_styles('editor-buttons'); @@ -196,10 +196,10 @@ } if ( !empty($set['editor_css']) ) - echo $set['editor_css'] . "\n"; + echo $set['editor_css'], "\n"; if ( !empty($buttons) || $set['media_buttons'] ) { - echo '
              '; + echo '
              '; if ( $set['media_buttons'] ) { self::$has_medialib = true; @@ -207,7 +207,7 @@ if ( !function_exists('media_buttons') ) include(ABSPATH . 'wp-admin/includes/media.php'); - echo '
              '; + echo '
              '; /** * Fires after the default media button(s) are displayed. @@ -220,7 +220,7 @@ echo "
              \n"; } - echo '
              ' . $buttons . "
              \n"; + echo '
              ', $buttons, "
              \n"; echo "
              \n"; } @@ -1135,17 +1135,17 @@ if ( $tmce_on ) { if ( $compressed ) { - echo "\n"; + echo '', "\n"; } else { - echo "\n"; - echo "\n"; + echo '', "\n"; + echo '', "\n"; } - echo "\n"; + echo "\n"; if ( self::$ext_plugins ) { // Load the old-format English strings to prevent unsightly labels in old style popups - echo "\n"; + echo '', "\n"; } } @@ -1164,10 +1164,10 @@ Index: I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-http-ixr-client.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-http-ixr-client.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-http-ixr-client.php (working copy) @@ -69,7 +69,7 @@ // Now send the request if ( $this->debug ) - echo '
              ' . htmlspecialchars($xml) . "\n
              \n\n"; + echo '
              ', htmlspecialchars( $xml ), "\n
              \n\n"; $response = wp_remote_post($url, $args); @@ -86,7 +86,7 @@ } if ( $this->debug ) - echo '
              ' . htmlspecialchars( wp_remote_retrieve_body( $response ) ) . "\n
              \n\n"; + echo '
              ', htmlspecialchars( wp_remote_retrieve_body( $response ) ), "\n
              \n\n"; // Now parse what we've got back $this->message = new IXR_Message( wp_remote_retrieve_body( $response ) ); Index: I:\000_WP_SVN\wp-core\src\wp-includes\comment-template.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\comment-template.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\comment-template.php (working copy) @@ -1022,13 +1022,11 @@ xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"> \n"; - echo ''; + echo '"', "\n", + ' dc:identifier="', get_the_permalink(), '"', "\n", + ' dc:title="', str_replace( '--', '--', wptexturize( strip_tags( get_the_title() ) ) ), '"', "\n", + ' trackback:ping="', get_trackback_url(), '"', " />\n", + ''; } /** @@ -1305,7 +1303,11 @@ } if ( 0 == $number && !comments_open() && !pings_open() ) { - echo '' . $none . ''; + if ( ! empty( $css_class ) ) { + echo '', $none, ''; + } else { + echo '', $none, ''; + } return; } @@ -1320,18 +1322,18 @@ $home = home_url(); else $home = get_option('siteurl'); - echo $home . '/' . $wpcommentspopupfile . '?comments_popup=' . $id; + echo $home, '/', $wpcommentspopupfile, '?comments_popup=', $id; echo '" onclick="wpopen(this.href); return false"'; } else { // if comments_popup_script() is not in the template, display simple comment link if ( 0 == $number ) - echo get_permalink() . '#respond'; + echo get_permalink(), '#respond'; else comments_link(); echo '"'; } if ( !empty( $css_class ) ) { - echo ' class="'.$css_class.'" '; + echo ' class="', $css_class, '" '; } $attributes = ''; @@ -2337,7 +2339,7 @@ * * @param string $field The HTML-formatted output of the comment form field. */ - echo apply_filters( "comment_form_field_{$name}", $field ) . "\n"; + echo apply_filters( "comment_form_field_{$name}", $field ), "\n"; } /** * Fires after the comment fields in the comment form. Index: I:\000_WP_SVN\wp-core\src\wp-includes\feed-atom-comments.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\feed-atom-comments.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\feed-atom-comments.php (working copy) @@ -6,7 +6,7 @@ */ header('Content-Type: ' . feed_content_type('atom') . '; charset=' . get_option('blog_charset'), true); -echo ''; +echo ''; /** This action is documented in wp-includes/feed-rss2.php */ do_action( 'rss_tag_pre', 'atom-comments' ); Index: I:\000_WP_SVN\wp-core\src\wp-includes\widgets.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\widgets.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\widgets.php (working copy) @@ -136,7 +136,7 @@ * @return string Default return is 'noform'. */ public function form($instance) { - echo '

              ' . __('There are no options for this widget.') . '

              '; + echo '

              ', __( 'There are no options for this widget.' ), '

              '; return 'noform'; } Index: I:\000_WP_SVN\wp-core\src\wp-includes\cache.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\cache.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\cache.php (working copy) @@ -641,13 +641,13 @@ * @since 2.0.0 */ public function stats() { - echo "

              "; - echo "Cache Hits: {$this->cache_hits}
              "; - echo "Cache Misses: {$this->cache_misses}
              "; - echo "

              "; - echo '
                '; + echo '

                ', + 'Cache Hits: ', $this->cache_hits, '
                ', + 'Cache Misses: ', $this->cache_misses, '
                ', + '

                ', + '
                  '; foreach ($this->cache as $group => $cache) { - echo "
                • Group: $group - ( " . number_format( strlen( serialize( $cache ) ) / 1024, 2 ) . 'k )
                  • '; + echo '
                • Group: ', $group, ' - ( ', number_format( strlen( serialize( $cache ) ) / 1024, 2 ), 'k )
                  • '; } echo '
                '; } Index: I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-customize-panel.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-customize-panel.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-customize-panel.php (working copy) @@ -319,7 +319,7 @@
                ' . esc_html( $this->title ) . '' ); + printf( __( 'You are customizing %s' ), '' . esc_html( $this->title ) . '' ); ?>
                description ) ) : ?> Index: I:\000_WP_SVN\wp-core\src\wp-includes\atomlib.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\atomlib.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\atomlib.php (working copy) @@ -97,7 +97,7 @@ function _p($msg) { if($this->debug) { - print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n"; + echo str_repeat( ' ', $this->depth * $this->indent ), $msg, "\n"; } } Index: I:\000_WP_SVN\wp-core\src\wp-includes\feed-rss2.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\feed-rss2.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\feed-rss2.php (working copy) @@ -8,7 +8,7 @@ header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_option('blog_charset'), true); $more = 1; -echo ''; +echo ''; /** * Fires between the xml and rss tags in a feed. Index: I:\000_WP_SVN\wp-core\src\wp-includes\feed-rss.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\feed-rss.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\feed-rss.php (working copy) @@ -8,7 +8,7 @@ header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_option('blog_charset'), true); $more = 1; -echo ''; ?> +echo ''; ?> <?php bloginfo_rss('name'); wp_title_rss(); ?> Index: I:\000_WP_SVN\wp-core\src\wp-includes\class-phpmailer.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\class-phpmailer.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\class-phpmailer.php (working copy) @@ -623,7 +623,7 @@ break; case 'html': //Cleans up output a bit for a better looking display that's HTML-safe - echo htmlentities(preg_replace('/[\r\n]+/', '', $str), ENT_QUOTES, $this->CharSet) . "
                \n"; + echo htmlentities( preg_replace( '/[\r\n]+/', '', $str ), ENT_QUOTES, $this->CharSet ), "
                \n"; break; case 'echo': default: Index: I:\000_WP_SVN\wp-core\src\wp-includes\locale.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\locale.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\locale.php (working copy) @@ -189,7 +189,7 @@ } function rtl_src_admin_notice() { - echo '

                ' . 'The build directory of the develop repository must be used for RTL.' . '

                '; + echo '

                ', __( 'The build directory of the develop repository must be used for RTL.' ), '

                '; } /** Index: I:\000_WP_SVN\wp-core\src\wp-includes\general-template.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\general-template.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\general-template.php (working copy) @@ -746,7 +746,7 @@ return; } - echo '' . wp_title( '|', false, 'right' ) . "\n"; + echo '', wp_title( '|', false, 'right' ), "\n"; } /** @@ -936,7 +936,7 @@ */ $title = apply_filters( 'single_post_title', $_post->post_title, $_post ); if ( $display ) - echo $prefix . $title; + echo $prefix, $title; else return $prefix . $title; } @@ -974,7 +974,7 @@ $title = apply_filters( 'post_type_archive_title', $post_type_obj->labels->name, $post_type ); if ( $display ) - echo $prefix . $title; + echo $prefix, $title; else return $prefix . $title; } @@ -1079,7 +1079,7 @@ return; if ( $display ) - echo $prefix . $term_name; + echo $prefix, $term_name; else return $prefix . $term_name; } @@ -1141,7 +1141,7 @@ $title = get_the_archive_title(); if ( ! empty( $title ) ) { - echo $before . $title . $after; + echo $before, $title, $after; } } @@ -1218,7 +1218,7 @@ function the_archive_description( $before = '', $after = '' ) { $description = get_the_archive_description(); if ( $description ) { - echo $before . $description . $after; + echo $before, $description, $after; } } @@ -2242,8 +2242,8 @@ $args = wp_parse_args( $args, $defaults ); - echo '\n"; - echo '\n"; + echo '\n"; + echo '\n"; } /** @@ -2319,7 +2319,7 @@ } if ( isset($title) && isset($href) ) - echo '' . "\n"; + echo '', "\n"; } /** @@ -2329,7 +2329,7 @@ * @since 2.0.0 */ function rsd_link() { - echo '\n"; + echo '\n"; } /** @@ -2984,7 +2984,7 @@ * @param string $type The type of generator to output. Accepts 'html', * 'xhtml', 'atom', 'rss2', 'rdf', 'comment', 'export'. */ - echo apply_filters( 'the_generator', get_the_generator($type), $type ) . "\n"; + echo apply_filters( 'the_generator', get_the_generator($type), $type ), "\n"; } /** Index: I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-customize-control.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-customize-control.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\class-wp-customize-control.php (working copy) @@ -387,7 +387,7 @@ */ public function input_attrs() { foreach( $this->input_attrs as $attr => $value ) { - echo $attr . '="' . esc_attr( $value ) . '" '; + echo $attr, '="', esc_attr( $value ), '" '; } } @@ -454,7 +454,7 @@ Index: I:\000_WP_SVN\wp-core\src\wp-includes\post-template.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\post-template.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\post-template.php (working copy) @@ -390,7 +390,7 @@ */ function post_class( $class = '', $post_id = null ) { // Separates classes with a single space, collates classes for post DIV - echo 'class="' . join( ' ', get_post_class( $class, $post_id ) ) . '"'; + echo 'class="', join( ' ', get_post_class( $class, $post_id ) ), '"'; } /** @@ -513,7 +513,7 @@ */ function body_class( $class = '' ) { // Separates classes with a single space, collates classes for body element - echo 'class="' . join( ' ', get_body_class( $class ) ) . '"'; + echo 'class="', join( ' ', get_body_class( $class ) ), '"'; } /** @@ -1823,9 +1823,9 @@ $rows .= "\t
              • " . wp_post_revision_title_expanded( $revision ) . "
                • \n"; } - echo "

                " . __( 'JavaScript must be enabled to use this feature.' ) . "

                \n"; + echo '

                ', __( 'JavaScript must be enabled to use this feature.' ), "

                \n"; - echo "
                  \n"; - echo $rows; - echo "
                "; + echo '
                  ', "\n", + $rows, + '
                '; } Index: I:\000_WP_SVN\wp-core\src\wp-includes\theme.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\theme.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\theme.php (working copy) @@ -635,7 +635,7 @@ $stylesheet = get_locale_stylesheet_uri(); if ( empty($stylesheet) ) return; - echo ''; + echo ''; } /** Index: I:\000_WP_SVN\wp-core\src\wp-includes\link-template.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\link-template.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\link-template.php (working copy) @@ -74,11 +74,11 @@ switch ( strtolower( $mode ) ) { case 'title': $title = sanitize_title( $post->post_title ) . '-' . $post->ID; - echo ''; + echo ''; break; case 'id': default: - echo ''; + echo ''; break; } } @@ -880,7 +880,7 @@ * * @param string $link The anchor tag for the edit link. */ - echo $before . apply_filters( 'edit_tag_link', $link ) . $after; + echo $before, apply_filters( 'edit_tag_link', $link ), $after; } /** @@ -1231,7 +1231,7 @@ * @param int $post_id Post ID. * @param string $text Anchor text. */ - echo $before . apply_filters( 'edit_post_link', $link, $post->ID, $text ) . $after; + echo $before, apply_filters( 'edit_post_link', $link, $post->ID, $text ), $after; } /** @@ -1333,7 +1333,7 @@ * @param int $comment_id Comment ID. * @param string $text Anchor text. */ - echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID, $text ) . $after; + echo $before, apply_filters( 'edit_comment_link', $link, $comment->comment_ID, $text ), $after; } /** @@ -1392,7 +1392,7 @@ * @param string $link Anchor tag for the edit link. * @param int $link_id Bookmark ID. */ - echo $before . apply_filters( 'edit_bookmark_link', $link, $bookmark->link_id ) . $after; + echo $before, apply_filters( 'edit_bookmark_link', $link, $bookmark->link_id ), $after; } /** @@ -3318,7 +3318,7 @@ if ( empty( $shortlink ) ) return; - echo "\n"; + echo '\n"; } /** Index: I:\000_WP_SVN\wp-core\src\wp-includes\feed-atom.php =================================================================== --- I:\000_WP_SVN\wp-core\src\wp-includes\feed-atom.php (revision 32108) +++ I:\000_WP_SVN\wp-core\src\wp-includes\feed-atom.php (working copy) @@ -8,7 +8,7 @@ header('Content-Type: ' . feed_content_type('atom') . '; charset=' . get_option('blog_charset'), true); $more = 1; -echo ''; +echo ''; /** This action is documented in wp-includes/feed-rss2.php */ do_action( 'rss_tag_pre', 'atom' );