Index: wp-includes/default-widgets.php =================================================================== --- wp-includes/default-widgets.php (revision 11010) +++ wp-includes/default-widgets.php (working copy) @@ -185,6 +185,12 @@ echo $after_widget; } + + function form( $instance ) { ?> + +'; get_calendar(); Index: wp-includes/wp-diff.php =================================================================== --- wp-includes/wp-diff.php (revision 11010) +++ wp-includes/wp-diff.php (working copy) @@ -128,7 +128,7 @@ * @return string */ function emptyLine() { - return ' '; + return ' '; } /** Index: wp-includes/comment-template.php =================================================================== --- wp-includes/comment-template.php (revision 11010) +++ wp-includes/comment-template.php (working copy) @@ -1242,7 +1242,7 @@
-
+
Index: wp-includes/general-template.php =================================================================== --- wp-includes/general-template.php (revision 11010) +++ wp-includes/general-template.php (working copy) @@ -792,7 +792,7 @@ $url = get_month_link( $arcresult->year, $arcresult->month ); $text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($arcresult->month), $arcresult->year); if ( $show_post_count ) - $after = ' ('.$arcresult->posts.')' . $afterafter; + $after = ' ('.$arcresult->posts.')' . $afterafter; $output .= get_archives_link($url, $text, $format, $before, $after); } } @@ -813,7 +813,7 @@ $url = get_year_link($arcresult->year); $text = sprintf('%d', $arcresult->year); if ($show_post_count) - $after = ' ('.$arcresult->posts.')' . $afterafter; + $after = ' ('.$arcresult->posts.')' . $afterafter; $output .= get_archives_link($url, $text, $format, $before, $after); } } @@ -835,7 +835,7 @@ $date = sprintf('%1$d-%2$02d-%3$02d 00:00:00', $arcresult->year, $arcresult->month, $arcresult->dayofmonth); $text = mysql2date($archive_day_date_format, $date); if ($show_post_count) - $after = ' ('.$arcresult->posts.')'.$afterafter; + $after = ' ('.$arcresult->posts.')'.$afterafter; $output .= get_archives_link($url, $text, $format, $before, $after); } } @@ -864,7 +864,7 @@ $url = sprintf('%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', get_option('home'), '', '?', '=', $arc_year, '&', '=', $arcresult->week); $text = $arc_week_start . $archive_week_separator . $arc_week_end; if ($show_post_count) - $after = ' ('.$arcresult->posts.')'.$afterafter; + $after = ' ('.$arcresult->posts.')'.$afterafter; $output .= get_archives_link($url, $text, $format, $before, $after); } } @@ -1024,17 +1024,17 @@ get_month_link($previous->year, $previous->month) . '" title="' . sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($previous->month), date('Y', mktime(0, 0 , 0, $previous->month, 1, $previous->year))) . '">« ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . ''; } else { - echo "\n\t\t".' '; + echo "\n\t\t".' '; } - echo "\n\t\t".' '; + echo "\n\t\t".' '; if ( $next ) { echo "\n\t\t".'' . $wp_locale->get_month_abbrev($wp_locale->get_month($next->month)) . ' »'; } else { - echo "\n\t\t".' '; + echo "\n\t\t".' '; } echo ' @@ -1090,7 +1090,7 @@ // See how much we should pad in the beginning $pad = calendar_week_mod(date('w', $unixmonth)-$week_begins); if ( 0 != $pad ) - echo "\n\t\t".' '; + echo "\n\t\t".' '; $daysinmonth = intval(date('t', $unixmonth)); for ( $day = 1; $day <= $daysinmonth; ++$day ) { @@ -1115,7 +1115,7 @@ $pad = 7 - calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins); if ( $pad != 0 && $pad != 7 ) - echo "\n\t\t".' '; + echo "\n\t\t".' '; echo "\n\t\n\t\n\t"; Index: wp-includes/classes.php =================================================================== --- wp-includes/classes.php (revision 11010) +++ wp-includes/classes.php (working copy) @@ -1246,7 +1246,7 @@ * @param array $args Uses 'selected' argument for selected page to set selected HTML attribute for option element. */ function start_el(&$output, $page, $depth, $args) { - $pad = str_repeat(' ', $depth * 3); + $pad = str_repeat(' ', $depth * 3); $output .= "\t\n"; } Index: wp-content/themes/default/functions.php =================================================================== --- wp-content/themes/default/functions.php (revision 11010) +++ wp-content/themes/default/functions.php (working copy) @@ -387,7 +387,7 @@ - + Index: wp-admin/includes/dashboard.php =================================================================== --- wp-admin/includes/dashboard.php (revision 11010) +++ wp-admin/includes/dashboard.php (working copy) @@ -524,7 +524,7 @@ $actions['approve'] = "" . __( 'Approve' ) . ''; $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; $actions['edit'] = "". __('Edit') . ''; - //$actions['quickedit'] = '' . __('Quick Edit') . ''; + //$actions['quickedit'] = '' . __('Quick Edit') . ''; $actions['reply'] = '' . __('Reply') . ''; $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; $actions['delete'] = "" . __('Delete') . ''; @@ -806,7 +806,7 @@ '&TB_iframe=true&width=600&height=800'; echo "

$label

\n"; - echo "
$title
 (" . __( 'Install' ) . ")\n"; + echo "
$title
 (" . __( 'Install' ) . ")\n"; echo "

$description

\n"; } } Index: wp-admin/includes/template.php =================================================================== --- wp-admin/includes/template.php (revision 11010) +++ wp-admin/includes/template.php (working copy) @@ -121,7 +121,7 @@ $edit = "name)) . "'>" . attribute_escape( $name ) . '
'; $actions = array(); $actions['edit'] = '' . __('Edit') . ''; - $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . ''; + $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . ''; if ( $default_cat_id != $category->term_id ) $actions['delete'] = "term_id) . "'>" . __('Delete') . ""; $actions = apply_filters('cat_row_actions', $actions, $category); @@ -162,7 +162,7 @@ if ( $default_cat_id != $category->term_id ) { $output .= ""; } else { - $output .= " "; + $output .= " "; } $output .= ''; break; @@ -292,7 +292,7 @@ $edit = "name)) . "'>$name
"; $actions = array(); $actions['edit'] = '' . __('Edit') . ''; - $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . ''; + $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . ''; if ( $default_cat_id != $category->term_id ) $actions['delete'] = "term_id) . "'>" . __('Delete') . ""; $actions = apply_filters('link_cat_row_actions', $actions, $category); @@ -332,7 +332,7 @@ if ( absint( get_option( 'default_link_category' ) ) != $category->term_id ) { $output .= ""; } else { - $output .= " "; + $output .= " "; } $output .= ""; break; @@ -652,7 +652,7 @@ $out .= '' . $name . '
'; $actions = array(); $actions['edit'] = '' . __('Edit') . ''; - $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . ''; + $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . ''; $actions['delete'] = "term_id) . "'>" . __('Delete') . ""; $actions = apply_filters('tag_row_actions', $actions, $tag); $action_count = count($actions); @@ -1435,7 +1435,7 @@ $actions = array(); if ( current_user_can('edit_post', $post->ID) ) { $actions['edit'] = '' . __('Edit') . ''; - $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . ''; + $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . ''; $actions['delete'] = "ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . ""; } if ( in_array($post->post_status, array('pending', 'draft')) ) { @@ -1648,7 +1648,7 @@ $actions = array(); if ( current_user_can('edit_page', $page->ID) ) { $actions['edit'] = '' . __('Edit') . ''; - $actions['inline'] = '' . __('Quick Edit') . ''; + $actions['inline'] = '' . __('Quick Edit') . ''; $actions['delete'] = "ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $page->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $page->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . ""; } if ( in_array($post->post_status, array('pending', 'draft')) ) { @@ -2138,7 +2138,7 @@ $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; $actions['delete'] = "" . __('Delete') . ''; $actions['edit'] = "". __('Edit') . ''; - $actions['quickedit'] = '' . __('Quick Edit') . ''; + $actions['quickedit'] = '' . __('Quick Edit') . ''; if ( 'spam' != $the_comment_status ) $actions['reply'] = '' . __('Reply') . ''; @@ -2212,12 +2212,6 @@ echo "#"; echo ''; } - break; - default: - echo "\n"; - do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID ); - echo "\n"; - break; } } echo "\n"; @@ -2609,7 +2603,7 @@ continue; } } - $pad = str_repeat( ' ', $level * 3 ); + $pad = str_repeat( ' ', $level * 3 ); if ( $item->ID == $default) $current = ' selected="selected"'; else Index: wp-admin/includes/media.php =================================================================== --- wp-admin/includes/media.php (revision 11010) +++ wp-admin/includes/media.php (working copy) @@ -790,7 +790,7 @@ $html .= ""; // only show the dimensions if that choice is available if ( $enabled ) - $html .= " "; + $html .= " "; $html .= ''; Index: wp-admin/js/theme-preview.dev.js =================================================================== --- wp-admin/js/theme-preview.dev.js (revision 11010) +++ wp-admin/js/theme-preview.dev.js (working copy) @@ -36,10 +36,10 @@ if ( alink.length ) { url = alink.attr('href') || ''; text = alink.attr('title') || ''; - link = '  ' + text + ''; + link = '  ' + text + ''; } else { text = $(this).attr('title') || ''; - link = '  ' + text + ''; + link = '  ' + text + ''; } $('#TB_title').css({'background-color':'#222','color':'#dfdfdf'}); Index: wp-admin/js/post.dev.js =================================================================== --- wp-admin/js/post.dev.js (revision 11010) +++ wp-admin/js/post.dev.js (working copy) @@ -40,7 +40,7 @@ val = jQuery.trim(val); if ( !val.match(/^\s+$/) && '' != val ) { button_id = jQuery(taxbox).attr('id') + '-check-num-' + key; - txt = 'X ' + val + ' '; + txt = 'X ' + val + ' '; jQuery(taxbox).find('.tagchecklist').append(txt); jQuery( '#' + button_id ).click( new_tag_remove_tag ); } Index: wp-admin/js/plugin-install.dev.js =================================================================== --- wp-admin/js/plugin-install.dev.js (revision 11010) +++ wp-admin/js/plugin-install.dev.js (working copy) @@ -23,7 +23,7 @@ thickDims().click( function() { $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'}); - $('#TB_ajaxWindowTitle').html('' + plugininstallL10n.plugin_information + ' ' + $(this).attr('title') ); + $('#TB_ajaxWindowTitle').html('' + plugininstallL10n.plugin_information + ' ' + $(this).attr('title') ); return false; }); Index: wp-admin/theme-editor.php =================================================================== --- wp-admin/theme-editor.php (revision 11010) +++ wp-admin/theme-editor.php (working copy) @@ -227,7 +227,7 @@ echo '

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

'; } ?> -
 
+
 
go back.' ), attribute_escape( stripslashes( ( isset( $_GET['_wp_original_http_referer'] ) ? $_GET['_wp_original_http_referer'] : '') ) ) ); $messages[2] = __('Custom field updated.'); $messages[3] = __('Custom field deleted.'); -$messages[4] = sprintf(__('Page updated. View page'), get_permalink($post_ID)); +$messages[4] = __('Page updated.'); $messages[5] = sprintf(__('Page published. View page'), get_permalink($post_ID)); $messages[6] = sprintf(__('Page submitted. Preview page'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ); @@ -460,7 +460,7 @@ + - + - + @@ -325,7 +325,7 @@ echo 'selected="selected"'; echo('>'.$r.''); } - ?>  + ?> 
-   +   - > > 
@@ -382,7 +382,7 @@

- +

http://wordpress.org/ — don’t forget the http://'); ?>

Index: wp-admin/import/btt.php =================================================================== --- wp-admin/import/btt.php (revision 11010) +++ wp-admin/import/btt.php (working copy) @@ -91,7 +91,7 @@ foreach ( $post_keys as $keyword ) { $keyword = addslashes(trim(str_replace('+',' ',$keyword))); if ( '' != $keyword ) { - echo '
  • ' . $post_meta->post_id . ' - ' . $keyword . '
    • '; + echo '
  • ' . $post_meta->post_id . ' - ' . $keyword . '
    • '; if ( !$precheck ) wp_add_post_tags($post_meta->post_id, $keyword); } Index: wp-admin/import/jkw.php =================================================================== --- wp-admin/import/jkw.php (revision 11010) +++ wp-admin/import/jkw.php (working copy) @@ -106,7 +106,7 @@ foreach ( $post_keys as $keyword ) { $keyword = addslashes(trim($keyword)); if ( '' != $keyword ) { - echo '
  • ' . $post_meta->post_id . ' - ' . $keyword . '
    • '; + echo '
  • ' . $post_meta->post_id . ' - ' . $keyword . '
    • '; if ( !$precheck ) wp_add_post_tags($post_meta->post_id, $keyword); } @@ -144,7 +144,7 @@ foreach ( $metakeys as $post_meta ) { $keyword = addslashes(trim($post_meta->tag_name)); if ( $keyword != '' ) { - echo '
  • ' . $post_meta->post_id . ' - ' . $keyword . '
    • '; + echo '
  • ' . $post_meta->post_id . ' - ' . $keyword . '
    • '; if ( !$precheck ) wp_add_post_tags($post_meta->post_id, $keyword); } Index: wp-admin/import/blogger.php =================================================================== --- wp-admin/import/blogger.php (revision 11010) +++ wp-admin/import/blogger.php (working copy) @@ -218,8 +218,8 @@ $pdone = isset($blog['posts_done']) ? (int) $blog['posts_done'] : 0; $cdone = isset($blog['comments_done']) ? (int) $blog['comments_done'] : 0; $init .= "blogs[$i]=new blog($i,'$blogtitle','{$blog['mode']}'," . $this->get_js_status($i) . ');'; - $pstat = "
     
    $pdone/{$blog['total_posts']}
    "; - $cstat = "
     
    $cdone/{$blog['total_comments']}
    "; + $pstat = "
     
    $pdone/{$blog['total_posts']}
    "; + $cstat = "
     
    $cdone/{$blog['total_comments']}
    "; $rows .= "$blogtitle{$blog['host']}$pstat$cstat\n"; } Index: wp-admin/import/greymatter.php =================================================================== --- wp-admin/import/greymatter.php (revision 11010) +++ wp-admin/import/greymatter.php (working copy) @@ -44,7 +44,7 @@
    • -

     

    +

     

    @@ -297,7 +297,7 @@ do_action('import_done', 'greymatter'); ?> -

     

    +

     

    footer(); Index: wp-admin/edit-form-comment.php =================================================================== --- wp-admin/edit-form-comment.php (revision 11010) +++ wp-admin/edit-form-comment.php (working copy) @@ -60,7 +60,7 @@ $stamp = __('Submitted on: %1$s'); $date = date_i18n( $datef, strtotime( $comment->comment_date ) ); ?> -  + 
    @@ -113,7 +113,7 @@ } else { _e( 'URL:' ); } ?> - + Index: wp-admin/edit-form-advanced.php =================================================================== --- wp-admin/edit-form-advanced.php (revision 11010) +++ wp-admin/edit-form-advanced.php (working copy) @@ -384,7 +384,7 @@ * @param object $post */ function post_trackback_meta_box($post) { - $form_trackback = 'to_ping) ) .'" />'; + $form_trackback = 'to_ping) ) .'" />'; if ('' != $post->pinged) { $pings = '

    '. __('Already pinged:') . '