diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php index 7be6e69714..4b99ebae5d 100644 --- a/wp-admin/edit-tag-form.php +++ b/wp-admin/edit-tag-form.php @@ -61,7 +61,7 @@ do_action('edit_' . $taxonomy . '_form_pre', $tag, $taxonomy); ?> ?>

-

-exists($destination) ) return false; - // try using rename first. if that fails (for example, source is read only) try copy + // try using rename first. if that fails (for example, source is read only) try copy if ( @rename($source, $destination) ) return true; diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index b37f6fdb42..b9557b1390 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -565,17 +565,17 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) { else $needed_dirs[] = $to . untrailingslashit(dirname($info['name'])); } - + $needed_dirs = array_unique($needed_dirs); asort($needed_dirs); - + // Create those directories if need be: foreach ( $needed_dirs as $_dir ) { if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the Dir exists upon creation failure. Less I/O this way. return new WP_Error('mkdir_failed', __('Could not create directory.'), $_dir); } unset($needed_dirs); - + for ( $i = 0; $i < $z->numFiles; $i++ ) { if ( ! $info = $z->statIndex($i) ) return new WP_Error('stat_failed', __('Could not retrieve file from archive.')); diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index a11b110c81..dbe86f5434 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -482,7 +482,7 @@ function wp_write_post() { foreach ( $draft_ids as $temp => $real ) if ( time() + $temp > 86400 ) // 1 day: $temp is equal to -1 * time( then ) unset($draft_ids[$temp]); - + if ( isset($draft_ids[$temp_id]) ) { // Edit, don't write $_POST['post_ID'] = $draft_ids[$temp_id]; unset($_POST['temp_ID']); diff --git a/wp-admin/js/post.dev.js b/wp-admin/js/post.dev.js index 8ee991533b..6faee1ac0b 100644 --- a/wp-admin/js/post.dev.js +++ b/wp-admin/js/post.dev.js @@ -253,15 +253,15 @@ jQuery(document).ready( function($) { } // categories - $('.categorydiv').each(function(){ - var this_id = $(this).attr('id'), noSyncChecks = false, syncChecks, catAddAfter, popularCats; - var taxonomy_parts = this_id.split('-'); + $('.categorydiv').each(function(){ + var this_id = $(this).attr('id'), noSyncChecks = false, syncChecks, catAddAfter, popularCats; + var taxonomy_parts = this_id.split('-'); taxonomy_parts.shift(); var taxonomy = taxonomy_parts.join('-'); - var settingName = taxonomy+'_tab'; - if(taxonomy == 'category') - settingName = 'cats'; - + var settingName = taxonomy+'_tab'; + if(taxonomy == 'category') + settingName = 'cats'; + // TODO: move to jQuery 1.3+, support for multiple hierarchical taxonomies, see wp-lists.dev.js $('a', '#'+taxonomy+'-tabs').click(function(){ var t = $(this).attr('href'); @@ -274,25 +274,25 @@ jQuery(document).ready( function($) { setUserSetting(settingName,'pop'); return false; }); - + if ( getUserSetting(settingName) ) $('a[href="#'+taxonomy+'-pop"]', '#'+taxonomy+'-tabs').click(); // Ajax Cat - $('#new'+taxonomy).one( 'focus', function() { $(this).val( '' ).removeClass( 'form-input-tip' ) } ); - $('#'+taxonomy+'-add-submit').click(function(){$('#new'+taxonomy).focus();}); - - syncChecks = function() { - if ( noSyncChecks ) - return; - noSyncChecks = true; - var th = jQuery(this), c = th.is(':checked'), id = th.val().toString(); - $('#in-'+taxonomy+'-' + id + ', #in-'+taxonomy+'-category-' + id).attr( 'checked', c ); - noSyncChecks = false; - }; - - - + $('#new'+taxonomy).one( 'focus', function() { $(this).val( '' ).removeClass( 'form-input-tip' ) } ); + $('#'+taxonomy+'-add-submit').click(function(){$('#new'+taxonomy).focus();}); + + syncChecks = function() { + if ( noSyncChecks ) + return; + noSyncChecks = true; + var th = jQuery(this), c = th.is(':checked'), id = th.val().toString(); + $('#in-'+taxonomy+'-' + id + ', #in-'+taxonomy+'-category-' + id).attr( 'checked', c ); + noSyncChecks = false; + }; + + + catAddBefore = function( s ) { if ( !$('#new'+taxonomy).val() ) return false; diff --git a/wp-admin/network.php b/wp-admin/network.php index 97b4919cc5..66e40c2a52 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -363,7 +363,7 @@ switch( $action ) { case 'step2': check_admin_referer( 'install-network-1' ); - if ( isset( $_POST[ 'existing_network' ] ) ) { + if ( isset( $_POST[ 'existing_network' ] ) ) { // Install! $base = stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) ); if ( $base != '/' ) diff --git a/wp-content/themes/twentyten/404.php b/wp-content/themes/twentyten/404.php index 97bc7c3dc7..7605688507 100644 --- a/wp-content/themes/twentyten/404.php +++ b/wp-content/themes/twentyten/404.php @@ -2,7 +2,7 @@
- +

Not Found

@@ -11,11 +11,11 @@
-
+
+ \ No newline at end of file diff --git a/wp-content/themes/twentyten/archive.php b/wp-content/themes/twentyten/archive.php index 86eee7967b..db137ad3d9 100644 --- a/wp-content/themes/twentyten/archive.php +++ b/wp-content/themes/twentyten/archive.php @@ -1,10 +1,10 @@ - -
+ +
- - - + + +

%s', 'twentyten' ), get_the_time(get_option('date_format')) ) ?>

@@ -16,13 +16,13 @@ - + max_num_pages; if ( $total_pages > 1 ) { ?> - + @@ -34,10 +34,10 @@ - +
-
+
→', 'twentyten' ) ); ?>
@@ -47,20 +47,20 @@ ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ) ?> |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> -
+
- + max_num_pages; if ( $total_pages > 1 ) { ?> - - - + + + - - + + \ No newline at end of file diff --git a/wp-content/themes/twentyten/attachment.php b/wp-content/themes/twentyten/attachment.php index d0bfc36504..d908eb3b21 100644 --- a/wp-content/themes/twentyten/attachment.php +++ b/wp-content/themes/twentyten/attachment.php @@ -1,46 +1,46 @@ -
+

← post_parent) ?>

- +
>

- +
| - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t" ) ?> + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t" ) ?>
- +
-
+
id ) ) : $att_image = wp_get_attachment_image_src( $post->id, array(640,640)); ?>

<?php $post->post_excerpt; ?>

- + - - guid) ?> - -
+
+ + guid) ?> + +
post_excerpt) ) the_excerpt() ?>
→', 'twentyten' ) ); ?> ' . __( 'Pages:', 'twentyten' ) . '&after=
') ?>
- +
permalink. Follow any comments here with the RSS feed for this post.', 'twentyten' ), get_the_category_list(', '), @@ -67,5 +67,5 @@
- + \ No newline at end of file diff --git a/wp-content/themes/twentyten/author.php b/wp-content/themes/twentyten/author.php index 069e07d1fa..f5c49783bf 100644 --- a/wp-content/themes/twentyten/author.php +++ b/wp-content/themes/twentyten/author.php @@ -1,32 +1,32 @@ - -
+ +
- - - + + +

%s', 'twentyten' ), "$authordata->display_name" ) ?>

- +
-
+
-

+

- + max_num_pages; if ( $total_pages > 1 ) { ?> - + @@ -38,8 +38,8 @@
- -
+ +
→', 'twentyten' ) ); ?>
@@ -49,20 +49,20 @@ ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ) ?> |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> -
+
- + max_num_pages; if ( $total_pages > 1 ) { ?> - - - + + + - - + + \ No newline at end of file diff --git a/wp-content/themes/twentyten/category.php b/wp-content/themes/twentyten/category.php index 8fce1627f2..e1eec8c64a 100644 --- a/wp-content/themes/twentyten/category.php +++ b/wp-content/themes/twentyten/category.php @@ -1,22 +1,22 @@ - -
+ +
- - - + + +

' . $categorydesc . '
' ); ?> - + max_num_pages; if ( $total_pages > 1 ) { ?> - + @@ -28,13 +28,13 @@ - +
- -
+ +
→', 'twentyten' ) ); ?>
- +
@@ -43,20 +43,20 @@ ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ) ?> |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> -
+
- + max_num_pages; if ( $total_pages > 1 ) { ?> - - - + + + - - + + \ No newline at end of file diff --git a/wp-content/themes/twentyten/editor-style.css b/wp-content/themes/twentyten/editor-style.css index af0f5b5dd1..9a61ad3636 100644 --- a/wp-content/themes/twentyten/editor-style.css +++ b/wp-content/themes/twentyten/editor-style.css @@ -144,7 +144,7 @@ input, textarea { color: #444; font-size: 16px; - line-height: 24px; + line-height: 24px; } p, ul, @@ -205,26 +205,26 @@ h5 { h6 { font-size: 0.9em; } -table { - border: 1px solid #e7e7e7 !important; - text-align: left; - margin: 0 -1px 24px 0; - width: 100%; +table { + border: 1px solid #e7e7e7 !important; + text-align: left; + margin: 0 -1px 24px 0; + width: 100%; border-collapse: collapse; border-spacing: 0; -} -tr th, +} +tr th, thead th { border: none !important; - color: #888; - font-size: 12px; - font-weight: bold; - line-height: 18px; - padding: 9px 24px; -} + color: #888; + font-size: 12px; + font-weight: bold; + line-height: 18px; + padding: 9px 24px; +} tr td { border: none !important; - border-top: 1px solid #e7e7e7 !important; + border-top: 1px solid #e7e7e7 !important; padding: 6px 24px; } @@ -269,7 +269,7 @@ img.alignleft, img.alignright, img.aligncenter { -moz-border-radius: 0; -khtml-border-radius: 0; -webkit-border-radius: 0; - border-radius: 0; + border-radius: 0; } .wp-caption img { margin: 5px; @@ -277,6 +277,6 @@ img.alignleft, img.alignright, img.aligncenter { .wp-caption p.wp-caption-text { margin: 0 0 4px; } -.wp-smiley { +.wp-smiley { margin:0; } \ No newline at end of file diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php index 2c1186b15f..4dfe78ad7c 100644 --- a/wp-content/themes/twentyten/functions.php +++ b/wp-content/themes/twentyten/functions.php @@ -3,7 +3,7 @@ // Set the content width based on the Theme CSS $content_width = apply_filters('twentyten_content_width', 640 ); -// Your Changeable header business starts here +// Your Changeable header business starts here // No CSS, just IMG call define( 'HEADER_TEXTCOLOR', ''); define( 'HEADER_IMAGE', '%s/images/header-1.jpg'); // %s is theme dir uri @@ -95,7 +95,7 @@ function twentyten_comment($comment, $args, $depth) {
$depth, 'max_depth' => $args['max_depth']))) ?>
- +
  • @@ -178,62 +178,62 @@ function theme_widgets_init() { 'before_title' => '

    ', 'after_title' => '

    ', ) ); - + // Area 2 register_sidebar( array ( 'name' => 'Secondary Widget Area', - 'id' => 'secondary-widget-area', + 'id' => 'secondary-widget-area', 'description' => __('The secondary widget area' , 'twentyten'), 'before_widget' => '
  • ', 'after_widget' => "
    • ", 'before_title' => '

    ', 'after_title' => '

    ', ) ); - + // Area 3 register_sidebar( array ( 'name' => 'First Footer Widget Area', - 'id' => 'first-footer-widget-area', + 'id' => 'first-footer-widget-area', 'description' => __('The first footer widget area' , 'twentyten'), 'before_widget' => '
  • ', 'after_widget' => "
    • ", 'before_title' => '

    ', 'after_title' => '

    ', - ) ); + ) ); // Area 4 register_sidebar( array ( 'name' => 'Second Footer Widget Area', - 'id' => 'second-footer-widget-area', + 'id' => 'second-footer-widget-area', 'description' => __('The second footer widget area' , 'twentyten'), 'before_widget' => '
  • ', 'after_widget' => "
    • ", 'before_title' => '

    ', 'after_title' => '

    ', - ) ); + ) ); // Area 5 register_sidebar( array ( 'name' => 'Third Footer Widget Area', - 'id' => 'third-footer-widget-area', + 'id' => 'third-footer-widget-area', 'description' => __('The third footer widget area' , 'twentyten'), 'before_widget' => '
  • ', 'after_widget' => "
    • ", 'before_title' => '

    ', 'after_title' => '

    ', - ) ); + ) ); // Area 6 register_sidebar( array ( 'name' => 'Fourth Footer Widget Area', - 'id' => 'fourth-footer-widget-area', + 'id' => 'fourth-footer-widget-area', 'description' => __('The fourth footer widget area' , 'twentyten'), 'before_widget' => '
  • ', 'after_widget' => "
    • ", 'before_title' => '

    ', 'after_title' => '

    ', - ) ); - + ) ); + } // end theme_widgets_init diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php index 01c4092a40..07b9c5f82c 100644 --- a/wp-content/themes/twentyten/header.php +++ b/wp-content/themes/twentyten/header.php @@ -2,27 +2,27 @@ > <?php - if ( is_single() ) { single_post_title(); print ' | '; bloginfo('name'); } + if ( is_single() ) { single_post_title(); print ' | '; bloginfo('name'); } elseif ( is_home() || is_front_page() ) { bloginfo('name'); print ' | '; bloginfo('description'); get_page_number(); } elseif ( is_page() ) { single_post_title(''); print ' | '; bloginfo('name'); } elseif ( is_search() ) { print 'Search results for ' . wp_specialchars($s); get_page_number(); print ' | '; bloginfo('name'); } elseif ( is_404() ) { print 'Not Found | '; bloginfo('name'); } else { bloginfo('name'); wp_title('|'); get_page_number(); } ?> - + - + - + - + - + - + > @@ -30,11 +30,11 @@ - +
    diff --git a/wp-content/themes/twentyten/page.php b/wp-content/themes/twentyten/page.php index a908ca4688..02725f949d 100644 --- a/wp-content/themes/twentyten/page.php +++ b/wp-content/themes/twentyten/page.php @@ -1,23 +1,23 @@ - -
    + +
    - + - +
    >

    -' . __( 'Pages:', 'twentyten' ) . '&after=
    ') ?> +' . __( 'Pages:', 'twentyten' ) . '&after=
    ') ?> ', '' ) ?>
    -
    - - - -
    +
    + + + + - - + + \ No newline at end of file diff --git a/wp-content/themes/twentyten/print.css b/wp-content/themes/twentyten/print.css index c6c393f0f5..5fbc8d0489 100644 --- a/wp-content/themes/twentyten/print.css +++ b/wp-content/themes/twentyten/print.css @@ -1,4 +1,4 @@ -/* +/* This stylesheet reformats the theme for the printed page. */ diff --git a/wp-content/themes/twentyten/rtl.css b/wp-content/themes/twentyten/rtl.css index 9487a2df2a..fe50005f3e 100644 --- a/wp-content/themes/twentyten/rtl.css +++ b/wp-content/themes/twentyten/rtl.css @@ -1,12 +1,12 @@ -/* +/* Theme Name: Twenty Ten */ -/* -------------------------------------------------------------- - +/* -------------------------------------------------------------- + RTL Basics - + -------------------------------------------------------------- */ @@ -39,8 +39,8 @@ DESCRIPTION: Two-column fixed layout with one sidebar right of content /* =Fonts -------------------------------------------------------------- */ -body, -input, +body, +input, textarea, .page-title span { font-family: Georgia, "Bitstream Charter", serif; @@ -59,7 +59,7 @@ h3#reply-title, .comment-body thead th, .entry-content label, .entry-content tr th, -.entry-content thead th, +.entry-content thead th, .entry-meta, .entry-title, .entry-utility, @@ -139,8 +139,8 @@ blockquote { } #access .menu { - margin-right: 12px; - margin-left: 0; + margin-right: 12px; + margin-left: 0; } @@ -149,21 +149,21 @@ blockquote { } #access ul ul { - left:auto; + left:auto; right:0; float:right; } #access ul ul ul { - left:auto; - right:100%; + left:auto; + right:100%; } /* =Content -------------------------------------------------------------- */ -#content table { - text-align: right; - margin: 0 0 24px -1px; +#content table { + text-align: right; + margin: 0 0 24px -1px; } .entry-title, .entry-meta { @@ -199,7 +199,7 @@ blockquote { margin: 0 104px 0 0; } -/* Gallery listing +/* Gallery listing -------------------------------------------------------------- */ .category-gallery .gallery-thumb { @@ -207,14 +207,14 @@ blockquote { margin-left:20px; margin-right:0; } -#content .gallery .gallery-item { - float: right; +#content .gallery .gallery-item { + float: right; } /* =Images -------------------------------------------------------------- */ -#content .gallery .gallery-caption { +#content .gallery .gallery-caption { margin-right: 0; } diff --git a/wp-content/themes/twentyten/search.php b/wp-content/themes/twentyten/search.php index 940aa320d5..641d05d749 100644 --- a/wp-content/themes/twentyten/search.php +++ b/wp-content/themes/twentyten/search.php @@ -1,48 +1,48 @@ - -
    + +
    - + - +

    - + max_num_pages; if ( $total_pages > 1 ) { ?> - +
    >

    -post_type == 'post' ) { ?> +post_type == 'post' ) { ?>
    - +
    - -
    + +
    →', 'twentyten' ) ); ?> ' . __( 'Pages:', 'twentyten' ) . '&after=
    ') ?>
    -post_type == 'post' ) { ?> +post_type == 'post' ) { ?>
    | ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ) ?> |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> -
    - +
    +
    @@ -52,7 +52,7 @@
    ← Older posts', 'twentyten' )) ?>
    →', 'twentyten' )) ?>
    - + @@ -60,14 +60,14 @@

    - +
    - + - + - - + + \ No newline at end of file diff --git a/wp-content/themes/twentyten/sidebar-footer.php b/wp-content/themes/twentyten/sidebar-footer.php index f9d4f1135d..435a06d510 100644 --- a/wp-content/themes/twentyten/sidebar-footer.php +++ b/wp-content/themes/twentyten/sidebar-footer.php @@ -8,7 +8,7 @@ - +
    @@ -16,7 +16,7 @@
    - +
    @@ -24,7 +24,7 @@
    - +
    @@ -32,7 +32,7 @@
    - + \ No newline at end of file diff --git a/wp-content/themes/twentyten/sidebar.php b/wp-content/themes/twentyten/sidebar.php index 06e2b75aa4..ca7b6d17c5 100644 --- a/wp-content/themes/twentyten/sidebar.php +++ b/wp-content/themes/twentyten/sidebar.php @@ -11,7 +11,7 @@ - +

  • -
    • + - +
    + + - - - + + + - - + + \ No newline at end of file diff --git a/wp-content/themes/twentyten/style.css b/wp-content/themes/twentyten/style.css index 543a3a7ea5..ef16860c08 100644 --- a/wp-content/themes/twentyten/style.css +++ b/wp-content/themes/twentyten/style.css @@ -1,4 +1,4 @@ -/* +/* Theme Name: Twenty Ten Theme URI: http://wordpress.org/ Description: The 2010 default theme for WordPress. @@ -8,13 +8,13 @@ Tags: black, blue, white, two-columns, fixed-width, custom-header, theme-options */ -/* -------------------------------------------------------------- - +/* -------------------------------------------------------------- + Reset default browser CSS. - + Based on work by Eric Meyer: http://meyerweb.com/eric/tools/css/reset/index.html - + -------------------------------------------------------------- */ html, body, div, span, applet, object, iframe, @@ -35,7 +35,7 @@ table, caption, tbody, tfoot, thead, tr, th, td { body { line-height: 1; } -h1,h2,h3,h4,h5,h6 { +h1,h2,h3,h4,h5,h6 { font-weight: normal; clear: both; } @@ -92,8 +92,8 @@ DESCRIPTION: Two-column fixed layout with one sidebar right of content /* =Fonts -------------------------------------------------------------- */ -body, -input, +body, +input, textarea, .page-title span, .pingback a.url { @@ -113,7 +113,7 @@ h3#reply-title, .comment-body thead th, .entry-content label, .entry-content tr th, -.entry-content thead th, +.entry-content thead th, .entry-meta, .entry-title, .entry-utility, @@ -360,16 +360,16 @@ a:hover { } #access a { display:block; - text-decoration:none; - color:#aaa; + text-decoration:none; + color:#aaa; padding:0 10px; - line-height:38px; + line-height:38px; } #access ul ul { display:none; position:absolute; top:38px; - left:0; + left:0; float:left; -webkit-box-shadow: 0px 3px 3px rgba(0,0,0,0.2); -moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2); @@ -377,19 +377,19 @@ a:hover { z-index: 99999; } #access ul ul ul { - left:100%; - top:0; + left:100%; + top:0; } #access ul ul a { - background:#333; - height:auto; - line-height:1em; - padding:10px; + background:#333; + height:auto; + line-height:1em; + padding:10px; width: 130px; } -#access li:hover > a, +#access li:hover > a, #access ul ul :hover > a { - color:#fff; + color:#fff; background:#333; } #access ul li:hover > ul { @@ -413,7 +413,7 @@ a:hover { #content textarea { color: #444; font-size: 16px; - line-height: 24px; + line-height: 24px; } #content p, #content ul, @@ -455,25 +455,25 @@ a:hover { margin: 0 0 20px 0; line-height: 1.5em; } -#content table { - border: 1px solid #e7e7e7; - text-align: left; - margin: 0 -1px 24px 0; - width: 100%; -} -#content tr th, -#content thead th { - color: #888; - font-size: 12px; - font-weight: bold; - line-height: 18px; - padding: 9px 24px; -} -#content tr td { - border-top: 1px solid #e7e7e7; - padding: 6px 24px; +#content table { + border: 1px solid #e7e7e7; + text-align: left; + margin: 0 -1px 24px 0; + width: 100%; } -#content tr.odd td { +#content tr th, +#content thead th { + color: #888; + font-size: 12px; + font-weight: bold; + line-height: 18px; + padding: 9px 24px; +} +#content tr td { + border-top: 1px solid #e7e7e7; + padding: 6px 24px; +} +#content tr.odd td { background: #F2F7FC; } .hentry { @@ -677,7 +677,7 @@ a:hover { /* Gallery listing -------------------------------------------------------------- */ -.category-gallery { +.category-gallery { margin-bottom: 48px; } .category-gallery h2 { @@ -767,7 +767,7 @@ img.alignleft, img.alignright, img.aligncenter { #content .wp-caption p.wp-caption-text { margin: 0 0 4px; } -#content .wp-smiley { +#content .wp-smiley { margin:0; } #content .gallery { @@ -874,7 +874,7 @@ h3#comments-title { #comments .comment-body ol { margin-bottom: 18px; } -#comments .comment-body p:last-child { +#comments .comment-body p:last-child { margin-bottom: 6px; } #comments .comment-body blockquote p:last-child { @@ -997,10 +997,10 @@ h3#reply-title { #form-allowed-tags { color:#888; font-size: 12px; - line-height: 18px; + line-height: 18px; } #form-allowed-tags p { - margin:0; + margin:0; } #form-allowed-tags span { } @@ -1095,7 +1095,7 @@ h3#reply-title { } /* Footer widget areas */ -#footer-widget-area { +#footer-widget-area { } diff --git a/wp-content/themes/twentyten/tag.php b/wp-content/themes/twentyten/tag.php index 48263eb8c7..f6c0459606 100644 --- a/wp-content/themes/twentyten/tag.php +++ b/wp-content/themes/twentyten/tag.php @@ -1,20 +1,20 @@ - -
    + +
    - - - + + +

    - + max_num_pages; if ( $total_pages > 1 ) { ?> - + @@ -25,35 +25,35 @@ - +
    - -
    + +
    →', 'twentyten' ) ); ?>
    | - + - + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> -
    +
    - + max_num_pages; if ( $total_pages > 1 ) { ?> - - -
    + + + - - + + \ No newline at end of file diff --git a/wp-includes/default-constants.php b/wp-includes/default-constants.php index ff610f9902..bd95f7970d 100644 --- a/wp-includes/default-constants.php +++ b/wp-includes/default-constants.php @@ -258,7 +258,7 @@ function wp_default_constants( $context ) { * @since 2.1.0 */ define('STYLESHEETPATH', get_stylesheet_directory()); - + /** * Slug of the fallback theme for this install. * Will be used as the fallback if the current theme doesn't exist. diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php index 412fbf78f5..bd042a076b 100644 --- a/wp-includes/ms-load.php +++ b/wp-includes/ms-load.php @@ -144,7 +144,7 @@ function wpmu_current_site() { $current_site->cookie_domain = $cookie_domain; return $current_site; } - + if ( is_subdomain_install() ) { $sitedomain = substr( $domain, 1 + strpos( $domain, '.' ) ); $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path) ); diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index dbd3acce0a..77de7e98d5 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -393,7 +393,7 @@ function get_body_class( $class = '' ) { if ( is_single() ) { $postID = $wp_query->get_queried_object_id(); - + $classes[] = 'single postid-' . $postID; if ( is_attachment() ) {