diff --git a/wp-admin/admin-footer.php b/wp-admin/admin-footer.php index a70ff78a76..a96770b531 100644 --- a/wp-admin/admin-footer.php +++ b/wp-admin/admin-footer.php @@ -1,9 +1,9 @@ diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index c03e4d8215..a75fe7bb73 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -17,7 +17,7 @@ get_admin_page_title(); <?php bloginfo('name') ?> › <?php echo wp_specialchars( strip_tags( $title ) ); ?> — WordPress - +

-
-
- - - + +
+ + + -
+

|

add_query_arg( 'apage', '%#%' ), + 'base' => add_query_arg( 'apage', '%#%' ), 'format' => '', 'total' => ceil($total / 20), 'current' => $page @@ -176,7 +176,7 @@ if ( $extra_comments ) : ?> echo "comment_post_ID."&c=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to delete this comment by '%s'. \n 'Cancel' to stop, 'OK' to delete."), $comment->comment_author )) . "', theCommentList );\" class='delete'>" . __('Delete') . " "; } ?> -

'); return false } return confirm('')" /> diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 28d4a151b7..9aa94224e2 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -84,23 +84,23 @@ addLoadEvent(focusit); +

-

+

-

+

-

+

@@ -117,7 +117,7 @@ addLoadEvent(focusit);
-id ); // TODO: ROLE SYSTEM if ( $authors && count( $authors ) > 1 ) : ?> @@ -163,19 +163,19 @@ if ( $authors && count( $authors ) > 1 ) :

- -" style="font-weight: bold;" tabindex="4" /> +post_status, array('publish', 'future') ) || 0 == $post_ID ) { ?> - + - + - : -   -   +   +   @@ -68,7 +68,7 @@ addLoadEvent(focusit);   - comment_ID ) . "'; return true; } return false;\""; ?> /> + comment_ID ) . "'; return true; } return false;\""; ?> /> diff --git a/wp-admin/edit-form.php b/wp-admin/edit-form.php index 3945e3c3c2..696fd53611 100644 --- a/wp-admin/edit-form.php +++ b/wp-admin/edit-form.php @@ -20,12 +20,12 @@ addLoadEvent(focusit);

- +
- +
post_category); ?>
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php index c7eaa12e7f..855f730ba4 100644 --- a/wp-admin/edit-pages.php +++ b/wp-admin/edit-pages.php @@ -71,7 +71,7 @@ $all = !( $h2_search || $post_status_q ); if ($posts) { ?> - +
diff --git a/wp-admin/edit-post-rows.php b/wp-admin/edit-post-rows.php index efbebe4da4..453a66ac3f 100644 --- a/wp-admin/edit-post-rows.php +++ b/wp-admin/edit-post-rows.php @@ -102,14 +102,14 @@ foreach($posts_columns as $column_name=>$column_display_name) { } } ?> - + - - - + + + diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 1c4ea88535..df11c7b7e5 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -83,7 +83,7 @@ if ( is_single() ) { $h2_author = ' ' . __('by other authors'); } else { $author_user = get_userdata( get_query_var( 'author' ) ); - $h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name )); + $h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name )); } } $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching “%s”'), wp_specialchars( get_search_query() ) ) : ''; @@ -94,11 +94,11 @@ if ( is_single() ) { ?> -
- +
+
-
+
- 1 ) : ?> @@ -153,7 +153,7 @@ if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?
- + diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php index 98d1d80f7a..9dc05c9bca 100644 --- a/wp-admin/import/blogger.php +++ b/wp-admin/import/blogger.php @@ -919,7 +919,7 @@ class AtomParser { array_push($this->in_content, "<". $this->ns_to_prefix($name) ."{$xmlns_str}{$attrs_str}"); } else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) { $this->in_content = array(); - $this->is_xhtml = $attrs['type'] == 'xhtml'; + $this->is_xhtml = $attrs['type'] == 'xhtml'; array_push($this->in_content, array($tag,$this->depth)); } else if($tag == 'link') { array_push($this->entry->links, $attrs); @@ -935,7 +935,7 @@ class AtomParser { $tag = array_pop(split(":", $name)); if(!empty($this->in_content)) { - if($this->in_content[0][0] == $tag && + if($this->in_content[0][0] == $tag && $this->in_content[0][1] == $this->depth) { array_shift($this->in_content); if($this->is_xhtml) { @@ -998,14 +998,14 @@ class AtomParser { } } } - } + } return $name; } function xml_escape($string) { - return str_replace(array('&','"',"'",'<','>'), - array('&','"',''','<','>'), + return str_replace(array('&','"',"'",'<','>'), + array('&','"',''','<','>'), $string ); } } diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php index d63ffdb095..f17df9d8ed 100644 --- a/wp-admin/import/dotclear.php +++ b/wp-admin/import/dotclear.php @@ -109,19 +109,19 @@ function textconv ($s) { **/ class Dotclear_Import { - function header() + function header() { echo '
'; echo '

'.__('Import DotClear').'

'; echo '

'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

'; } - function footer() + function footer() { echo '
'; } - function greet() + function greet() { echo '

'.__('Howdy! This importer allows you to extract posts from a DotClear database into your blog. Mileage may vary.').'

'; echo '

'.__('Your DotClear Configuration settings are as follows:').'

'; diff --git a/wp-admin/import/mt.php b/wp-admin/import/mt.php index 012a1b2e52..23ab8fc1cc 100644 --- a/wp-admin/import/mt.php +++ b/wp-admin/import/mt.php @@ -357,9 +357,9 @@ class MT_Import { $post->post_date = $date; $post->post_date_gmt = $date_gmt; } else if ( 'comment' == $context ) { - $comment->comment_date = $date; + $comment->comment_date = $date; } else if ( 'ping' == $context ) { - $ping->comment_date = $date; + $ping->comment_date = $date; } } else if ( 0 === strpos($line, "EMAIL:") ) { $email = trim( substr($line, strlen("EMAIL:")) ); diff --git a/wp-admin/import/stp.php b/wp-admin/import/stp.php index 4a86a7e4a9..f3b6d30e80 100644 --- a/wp-admin/import/stp.php +++ b/wp-admin/import/stp.php @@ -19,7 +19,7 @@ class STP_Import { echo '

'.__('To accommodate larger databases for those tag-crazy authors out there, we have made this into an easy 4-step program to help you kick that nasty Simple Tagging habit. Just keep clicking along and we will let you know when you are in the clear!').'

'; echo '

'.__('Don’t be stupid - backup your database before proceeding!').'

'; echo '
'; - wp_nonce_field('import-utw'); + wp_nonce_field('import-utw'); echo '

'; echo ''; echo '
'; @@ -88,7 +88,7 @@ class STP_Import { } echo '
'; - wp_nonce_field('import-utw'); + wp_nonce_field('import-utw'); echo '

'; echo ''; echo ''; @@ -107,7 +107,7 @@ class STP_Import { echo '

' . sprintf( __('Done! %s tags where added!'), $tags_added ) . '

'; echo '
'; - wp_nonce_field('import-utw'); + wp_nonce_field('import-utw'); echo '

'; echo ''; echo ''; @@ -139,7 +139,7 @@ class STP_Import { $tags_added = 0; // loop through each post and add its tags to the db - foreach ( $posts as $this_post ) { + foreach ( $posts as $this_post ) { $the_post = (int) $this_post->post_id; $the_tag = $wpdb->escape($this_post->tag_name); diff --git a/wp-admin/import/textpattern.php b/wp-admin/import/textpattern.php index 46e3420b14..ee47441107 100644 --- a/wp-admin/import/textpattern.php +++ b/wp-admin/import/textpattern.php @@ -26,14 +26,14 @@ if(!function_exists('link_exists')) **/ class Textpattern_Import { - function header() + function header() { echo '
'; echo '

'.__('Import Textpattern').'

'; echo '

'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

'; } - function footer() + function footer() { echo '
'; } diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php index b9631aebe3..5f8ce81950 100644 --- a/wp-admin/import/wordpress.php +++ b/wp-admin/import/wordpress.php @@ -104,12 +104,12 @@ class WP_Import { if ( false !== strpos($importline, '') ) { $this->posts[$num] = ''; $doing_entry = true; - continue; + continue; } if ( false !== strpos($importline, '') ) { $num++; $doing_entry = false; - continue; + continue; } if ( $doing_entry ) { $this->posts[$num] .= $importline . "\n"; @@ -335,7 +335,7 @@ class WP_Import { $post_cats[] = $cat_ID; } wp_set_post_categories($post_id, $post_cats); - } + } } // Now for comments diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index bd7cb4d498..e5911bda79 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -261,8 +261,8 @@ function get_admin_page_title() { } else { foreach (array_keys( $submenu ) as $parent) { foreach ( $submenu[$parent] as $submenu_array ) { - if ( isset( $plugin_page ) && - ($plugin_page == $submenu_array[2] ) && + if ( isset( $plugin_page ) && + ($plugin_page == $submenu_array[2] ) && (($parent == $pagenow ) || ($parent == $plugin_page ) || ($plugin_page == $hook ) || (($pagenow == 'admin.php' ) && ($parent1 != $submenu_array[2] ) ) ) ) { $title = $submenu_array[3]; diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index ab70d0c5ba..7f595178dc 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -334,7 +334,7 @@ function add_meta( $post_ID ) { $metavalue = $wpdb->escape( $metavalue ); if ( ('0' === $metavalue || !empty ( $metavalue ) ) && ((('#NONE#' != $metakeyselect) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput) ) ) { - // We have a key/value pair. If both the select and the + // We have a key/value pair. If both the select and the // input for the key have data, the input takes precedence: if ('#NONE#' != $metakeyselect) @@ -347,8 +347,8 @@ function add_meta( $post_ID ) { return false; $result = $wpdb->query( " - INSERT INTO $wpdb->postmeta - (post_id,meta_key,meta_value ) + INSERT INTO $wpdb->postmeta + (post_id,meta_key,meta_value ) VALUES ('$post_ID','$metakey','$metavalue' ) " ); return $wpdb->insert_id; diff --git a/wp-admin/includes/taxonomy.php b/wp-admin/includes/taxonomy.php index f74e5e3269..b382262c5c 100644 --- a/wp-admin/includes/taxonomy.php +++ b/wp-admin/includes/taxonomy.php @@ -151,7 +151,7 @@ function wp_create_tag($tag_name) { if ( $id = tag_exists($tag_name) ) return $id; - return wp_insert_term($tag_name, 'post_tag'); + return wp_insert_term($tag_name, 'post_tag'); } ?> \ No newline at end of file diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index ebf4094d24..5f4efb168b 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -180,17 +180,17 @@ function page_rows( $parent = 0, $level = 0, $pages = 0, $hierarchy = true ) { $id = (int) $post->ID; $class = ('alternate' == $class ) ? '' : 'alternate'; ?> -
- + + + - + - - - + + + last_checked ) && - 43200 > ( time() - $current->last_checked ) && + if ( + isset( $current->last_checked ) && + 43200 > ( time() - $current->last_checked ) && !$plugin_changed ) return false; diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 89ae58b001..fc9f6bd33d 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -624,7 +624,7 @@ function upgrade_230() { if ( empty($term_id) ) { $wpdb->query("INSERT INTO $wpdb->terms (name, slug, term_group) VALUES ('$name', '$slug', '$term_group')"); - $term_id = (int) $wpdb->insert_id; + $term_id = (int) $wpdb->insert_id; } $link_cat_id_map[$cat_id] = $term_id; diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index 2949c8081c..ccf1fb0941 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -39,7 +39,7 @@ function edit_user( $user_id = 0 ) { if ( isset( $_POST['pass2'] )) $pass2 = $_POST['pass2']; - if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) { + if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) { if( $user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap( 'edit_users' )) $user->role = $_POST['role']; } diff --git a/wp-admin/index-extra.php b/wp-admin/index-extra.php index 3f59a5961b..31f2a5816c 100644 --- a/wp-admin/index-extra.php +++ b/wp-admin/index-extra.php @@ -8,7 +8,7 @@ switch ( $_GET['jax'] ) { case 'incominglinks' : -$rss_feed = apply_filters( 'dashboard_incoming_links_feed', 'http://blogsearch.google.com/blogsearch_feeds?hl=en&scoring=d&ie=utf-8&num=10&output=rss&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ); +$rss_feed = apply_filters( 'dashboard_incoming_links_feed', 'http://blogsearch.google.com/blogsearch_feeds?hl=en&scoring=d&ie=utf-8&num=10&output=rss&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ); $more_link = apply_filters( 'dashboard_incoming_links_link', 'http://blogsearch.google.com/blogsearch?hl=en&scoring=d&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ); $rss = @fetch_rss( $rss_feed ); diff --git a/wp-admin/index.php b/wp-admin/index.php index 5c298607a5..2447e2fe60 100644 --- a/wp-admin/index.php +++ b/wp-admin/index.php @@ -1,5 +1,5 @@ @@ -16,7 +16,7 @@ add_action( 'admin_head', 'index_js' ); wp_enqueue_script( 'jquery' ); -$title = __('Dashboard'); +$title = __('Dashboard'); $parent_file = 'index.php'; require_once('admin-header.php'); @@ -39,7 +39,7 @@ $numcomments = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE commen if ( $comments || $numcomments ) : ?>
-

»' ), 'edit-comments.php' ); ?>

+

»' ), 'edit-comments.php' ); ?>

diff --git a/wp-admin/link-category.php b/wp-admin/link-category.php index 51723f7cb1..42058928c3 100644 --- a/wp-admin/link-category.php +++ b/wp-admin/link-category.php @@ -60,9 +60,9 @@ case 'editedcat': wp_die(__('Cheatin’ uh?')); if ( wp_update_term($cat_ID, 'link_category', $_POST) ) - wp_redirect('edit-link-categories.php?message=3'); + wp_redirect('edit-link-categories.php?message=3'); else - wp_redirect('edit-link-categories.php?message=5'); + wp_redirect('edit-link-categories.php?message=5'); exit; break; diff --git a/wp-admin/link-import.php b/wp-admin/link-import.php index 138d0f4185..86d8b2657f 100644 --- a/wp-admin/link-import.php +++ b/wp-admin/link-import.php @@ -123,7 +123,7 @@ else } // end else if ( ! $blogrolling ) - apply_filters( 'wp_delete_file', $opml_url); + apply_filters( 'wp_delete_file', $opml_url); @unlink($opml_url); ?>
diff --git a/wp-admin/menu.php b/wp-admin/menu.php index 4ae1e18775..7aec2f42be 100644 --- a/wp-admin/menu.php +++ b/wp-admin/menu.php @@ -96,7 +96,7 @@ foreach ($submenu as $parent => $sub) { // Menus for which the original parent is not acessible due to lack of privs will have the next // submenu in line be assigned as the new menu parent. foreach ( $menu as $id => $data ) { - if ( empty($submenu[$data[2]]) ) + if ( empty($submenu[$data[2]]) ) continue; $subs = $submenu[$data[2]]; $first_sub = array_shift($subs); diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php index 470bc77a7c..fc46917c25 100644 --- a/wp-admin/moderation.php +++ b/wp-admin/moderation.php @@ -124,12 +124,12 @@ if ( isset( $_GET['paged'] ) ) { $start = ( $page * $per ) - $per; $stop = $start + $per; -$page_links = paginate_links( array( - 'base' => add_query_arg( 'paged', '%#%' ), - 'format' => '', - 'total' => ceil( $total / $per ), - 'current' => $page, - 'prev_text' => '«', +$page_links = paginate_links( array( + 'base' => add_query_arg( 'paged', '%#%' ), + 'format' => '', + 'total' => ceil( $total / $per ), + 'current' => $page, + 'prev_text' => '«', 'next_text' => '»' ) ); @@ -160,7 +160,7 @@ $comments = array_slice( $comments, $start, $stop ); ?>

  • - + comment_author_email ) ) { ?>| comment_author_url ) && $comment->comment_author_url != 'http://' ) { ?>| | @@ -171,9 +171,9 @@ $comments = array_slice( $comments, $start, $stop );

    - — - [ | - ', theCommentList );"> ] — + — + [ | + ', theCommentList );"> ] — comment_post_ID ) ); ?>

    diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php index 32cadace66..78deefdddc 100644 --- a/wp-admin/options-discussion.php +++ b/wp-admin/options-discussion.php @@ -7,78 +7,78 @@ $parent_file = 'options-general.php'; include('admin-header.php'); ?> -
    -

    -
    +
    +

    +

    -('.__('These settings may be overridden for individual articles.').')'; ?> -
      -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    -
    -
    - -
      -
    • - -
      • -
    • - -
      • -
    -
    -
    - +('.__('These settings may be overridden for individual articles.').')'; ?>
    • - -
      • -
      • -
      • -
    + +
    • +
  • + +
    • +
  • + +
    • + + +
    + + +
    +
    + +

    ' ) ?>

    moderation queue. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?>

    -

    - -

    +

    + +

    -

    - +

    +

    - - - + + +

    diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 3b7c909919..3e6ce862a9 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -9,62 +9,62 @@ include('./admin-header.php');

    -
    +

    -
    ID; ?>
    ID; ?> - post_modified ) _e('Unpublished'); else echo mysql2date( __('Y-m-d g:i a'), $post->post_modified ); ?>post_modified ) _e('Unpublished'); else echo mysql2date( __('Y-m-d g:i a'), $post->post_modified ); ?> " . __( 'Edit' ) . ""; } ?>" . __( 'Delete' ) . ""; } ?>
    " . __( 'Edit' ) . ""; } ?>" . __( 'Delete' ) . ""; } ?>
    - - - - - - +
    + + + + + + - - - - - + + + + + + - - + + + - - - + + - - - - + + + + - -

    -
    " />
    " />
    " />
    to be different from the directory you installed WordPress.'); ?>

    -

    -
    -
    -
    - - - - - + + +
    UTC time is:') ?>
    +
    + + + + + - @@ -76,7 +76,7 @@ include('./admin-header.php'); - + @@ -93,14 +93,14 @@ endfor;
    UTC time is:') ?>
    + (-6 for Central Time.'); ?>)

      Documentation on date formatting. Click "Update options" to update sample output.') ?>
    -
    +

    - - + +

    -
    + diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index 03116c533f..01919feb8a 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -108,9 +108,9 @@ else ?>

    -
    -

    -
    +
    +

    +

    URLs which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A number of tags are available, and here are some examples to get you started.'); ?>

    @@ -130,19 +130,19 @@ $structures = array(

    @@ -165,16 +165,16 @@ checked="checked"

    URLs here. For example, using /topics/ as your category base would make your category links like http://example.org/index.php/topics/uncategorized/. If you leave these blank the defaults will be used.') ?>

    -

    - : +

    + :

    - : -

    -

    - -

    - + : +

    +

    + +

    +

    .htaccess file were writable, we could do this automatically, but it isn’t so these are the mod_rewrite rules you should have in your .htaccess file. Click in the field and press CTRL + a to select all.') ?>

    diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php index 885edd61ee..3a7f80e7e3 100644 --- a/wp-admin/options-reading.php +++ b/wp-admin/options-reading.php @@ -7,25 +7,25 @@ $parent_file = 'options-general.php'; include('admin-header.php'); ?> -
    -

    +
    +

    -
    - - - - +
    + +
    + + - -

    @@ -40,30 +40,30 @@ include('admin-header.php');

    -
    + + +
    -
    - - - - +
    + +
    + + - -
    -
    -
    + + + + -
    - - - - - +
    + +
    + + + @@ -72,25 +72,25 @@ include('admin-header.php');

    <!--more--> feature, it will cut off posts in RSS feeds.'); ?>

    - -
    -
    - - - - -

    -recommended)') ?>
    + + + + + + + +

    +recommended)') ?>

    -

    - - - -

    - -
    + + + +

    + +
    \ No newline at end of file diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php index 5efc39c191..e8979c4542 100644 --- a/wp-admin/options-writing.php +++ b/wp-admin/options-writing.php @@ -7,17 +7,17 @@ $parent_file = 'options-general.php'; include('admin-header.php'); ?> -
    -

    -
    +
    +

    +

    - - - - - +
    -
    + + + +
    +
    diff --git a/wp-admin/page-new.php b/wp-admin/page-new.php index 6e0494f101..ff86155ba8 100644 --- a/wp-admin/page-new.php +++ b/wp-admin/page-new.php @@ -23,4 +23,4 @@ if ( current_user_can('edit_pages') ) { } ?> - + diff --git a/wp-admin/page.php b/wp-admin/page.php index 9f28bc2159..c6baadde52 100644 --- a/wp-admin/page.php +++ b/wp-admin/page.php @@ -139,7 +139,7 @@ case 'delete': if ( ! wp_delete_attachment($page_id) ) wp_die( __('Error in deleting...') ); } else { - if ( !wp_delete_post($page_id) ) + if ( !wp_delete_post($page_id) ) wp_die( __('Error in deleting...') ); } diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php index b4b04ec19b..05e747f86d 100644 --- a/wp-admin/post-new.php +++ b/wp-admin/post-new.php @@ -94,7 +94,7 @@ include('edit-form-advanced.php'); - + @@ -109,15 +109,15 @@ window.open ("profile.php?action=IErightclick", "oneclickbookmarklet", "width=50


    - + - + - + diff --git a/wp-admin/post.php b/wp-admin/post.php index f083686624..680f8abeba 100644 --- a/wp-admin/post.php +++ b/wp-admin/post.php @@ -154,7 +154,7 @@ case 'delete': if ( ! wp_delete_attachment($post_id) ) wp_die( __('Error in deleting...') ); } else { - if ( !wp_delete_post($post_id) ) + if ( !wp_delete_post($post_id) ) wp_die( __('Error in deleting...') ); } diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php index b1877bbf94..5541f31220 100644 --- a/wp-admin/theme-editor.php +++ b/wp-admin/theme-editor.php @@ -97,7 +97,7 @@ default: -
    +
    ' . sprintf(__('Editing %s'), $file_show) . ''; diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index b7947961ce..1758d4c9b3 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -36,7 +36,7 @@ switch($step) : ?>

    -

    +

    +?>

    diff --git a/wp-admin/users.php b/wp-admin/users.php index 8b955e5c3c..7797b2ce73 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -359,7 +359,7 @@ default:

    -

    first_user && $wp_user_search->total_users_for_query <= 50 ) printf(__('%3$s shown below'), $wp_user_search->first_user + 1, min($wp_user_search->first_user + $wp_user_search->users_per_page, $wp_user_search->total_users_for_query), $wp_user_search->total_users_for_query); else @@ -450,11 +450,11 @@ foreach ( (array) $roleclass as $user_object ) {
    -' . sprintf(__('Users can register themselves or you can manually create users here.'), get_option('siteurl').'/wp-register.php') . '

    '; - else - echo '

    ' . sprintf(__('Users cannot currently register themselves, but you can manually create users here.'), get_option('siteurl').'/wp-admin/options-general.php#users_can_register') . '

    '; +' . sprintf(__('Users can register themselves or you can manually create users here.'), get_option('siteurl').'/wp-register.php') . '

    '; + else + echo '

    ' . sprintf(__('Users cannot currently register themselves, but you can manually create users here.'), get_option('siteurl').'/wp-admin/options-general.php#users_can_register') . '

    '; ?>
    diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 027fa835f2..a33dc8463b 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -91,11 +91,11 @@ function wp_widgets_admin_head() { var elHeight = parseInt( jQuery(o).css('height') ); var elLeft = parseInt( jQuery(o).css('left') ); var elTop = parseInt( jQuery(o).css('top') ); - if ( screenWidth < ( parseInt(elLeft) + parseInt(elWidth) ) ) + if ( screenWidth < ( parseInt(elLeft) + parseInt(elWidth) ) ) jQuery(o).css('left', ( screenWidth - elWidth ) + 'px' ); - if ( screenHeight < ( parseInt(elTop) + parseInt(elHeight) ) ) + if ( screenHeight < ( parseInt(elTop) + parseInt(elHeight) ) ) jQuery(o).css('top', ( screenHeight - elHeight ) + 'px' ); - if ( elLeft < 1 ) + if ( elLeft < 1 ) jQuery(o).css('left', '1px'); if ( elTop < 1 ) jQuery(o).css('top', '1px'); @@ -129,10 +129,10 @@ function wp_widgets_admin_head() { } function updateAll() { - jQuery.map(cols, function(o) { + jQuery.map(cols, function(o) { if ( jQuery('#' + o + ' li').length ) jQuery('#'+o+'placemat span.handle').hide(); - else + else jQuery('#'+o+'placemat span.handle').show(); }); resetDroppableHeights(); @@ -157,7 +157,7 @@ function wp_widget_draggable( $name ) { $sanitized_name = sanitize_title( $wp_registered_widgets[$name]['id'] ); $link_title = __( 'Configure' ); - $popper = ( isset( $wp_registered_widget_controls[$name] ) ) + $popper = ( isset( $wp_registered_widget_controls[$name] ) ) ? '
    ≡
    ' : ''; diff --git a/wp-app.php b/wp-app.php index 5e95dfc5ba..f854a74c5e 100644 --- a/wp-app.php +++ b/wp-app.php @@ -135,7 +135,7 @@ class AtomServer { // authenticate regardless of the operation and set the current // user. each handler will decide if auth is required or not. - $this->authenticate(); + $this->authenticate(); $u = wp_get_current_user(); if(!isset($u) || $u->ID == 0) { if ($always_authenticate) { @@ -322,7 +322,7 @@ EOD; $post_excerpt = $parsed->summary[1]; $pubtimes = $this->get_publish_time($entry); $post_date = $pubtimes[0]; - $post_date_gmt = $pubtimes[1]; + $post_date_gmt = $pubtimes[1]; // let's not go backwards and make something draft again. if(!$publish && $post_status == 'draft') { @@ -721,7 +721,7 @@ EOD; $next_page = (($page + 1) > $last_page) ? NULL : $page + 1; $prev_page = ($page - 1) < 1 ? NULL : $page - 1; $last_page = ((int)$last_page == 1 || (int)$last_page == 0) ? NULL : (int) $last_page; - $self_page = $page > 1 ? $page : NULL; + $self_page = $page > 1 ? $page : NULL; ?> the_entries_url() ?> @@ -1122,7 +1122,7 @@ EOD; $match[3] == '+0000'; return strtotime($match[1] . " " . $match[2] . " " . $match[3]); - } + } function get_publish_time($entry) { diff --git a/wp-content/plugins/hello.php b/wp-content/plugins/hello.php index 35fdaca725..14374585b6 100644 --- a/wp-content/plugins/hello.php +++ b/wp-content/plugins/hello.php @@ -6,7 +6,7 @@ Description: This is not just a plugin, it symbolizes the hope and enthusiasm of Author: Matt Mullenweg Version: 1.5 Author URI: http://photomatt.net/ -*/ +*/ // These are the lyrics to Hello Dolly $lyrics = "Hello, Dolly diff --git a/wp-content/themes/classic/comments-popup.php b/wp-content/themes/classic/comments-popup.php index cd592ae97d..e7f68766c8 100644 --- a/wp-content/themes/classic/comments-popup.php +++ b/wp-content/themes/classic/comments-popup.php @@ -56,9 +56,9 @@ if (!empty($commentstatus->post_password) && $_COOKIE['wp-postpass_'. COOKIEHASH

    HTML allowed:"); ?>

    - +

    '.$user_identity.''); ?>

    - +

    diff --git a/wp-content/themes/default/attachment.php b/wp-content/themes/default/attachment.php index eca92c8955..82064316b7 100644 --- a/wp-content/themes/default/attachment.php +++ b/wp-content/themes/default/attachment.php @@ -25,10 +25,10 @@ post_date) - (60*120)); echo time_since($entry_datetime); echo ' ago'; */ ?> + /* $entry_datetime = abs(strtotime($post->post_date) - (60*120)); echo time_since($entry_datetime); echo ' ago'; */ ?> on at and is filed under . - You can follow any responses to this entry through the feed. + You can follow any responses to this entry through the feed. comment_status) && ('open' == $post->ping_status)) { // Both Comments and Pings are open ?> diff --git a/wp-content/themes/default/comments-popup.php b/wp-content/themes/default/comments-popup.php index 9ad28b5e0f..06aab2d5a8 100644 --- a/wp-content/themes/default/comments-popup.php +++ b/wp-content/themes/default/comments-popup.php @@ -56,9 +56,9 @@ if (!empty($post->post_password) && $_COOKIE['wp-postpass_'. COOKIEHASH] != $pos

    Line and paragraph breaks automatic, e-mail address never displayed, HTML allowed:

    - +

    Logged in as . Logout »

    - +

    diff --git a/wp-includes/atomlib.php b/wp-includes/atomlib.php index b72038523f..a5189084f4 100644 --- a/wp-includes/atomlib.php +++ b/wp-includes/atomlib.php @@ -1,12 +1,12 @@ * Version: 0.4 - * + * */ class AtomFeed { @@ -165,8 +165,8 @@ class AtomParser { } else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) { $this->in_content = array(); - $this->is_xhtml = $attrs['type'] == 'xhtml'; - $this->is_html = $attrs['type'] == 'html' || $attrs['type'] == 'text/html'; + $this->is_xhtml = $attrs['type'] == 'xhtml'; + $this->is_html = $attrs['type'] == 'html' || $attrs['type'] == 'text/html'; $this->is_text = !in_array('type',array_keys($attrs)) || $attrs['type'] == 'text'; $type = $this->is_xhtml ? 'XHTML' : ($this->is_html ? 'HTML' : ($this->is_text ? 'TEXT' : $attrs['type'])); @@ -194,7 +194,7 @@ class AtomParser { if(!empty($this->in_content)) { # if we are ending the original content element # then let's finalize the content - if($this->in_content[0][0] == $tag && + if($this->in_content[0][0] == $tag && $this->in_content[0][1] == $this->depth) { $origtype = $this->in_content[0][2]; array_shift($this->in_content); @@ -276,7 +276,7 @@ class AtomParser { } } } - } + } if($attr) { return array(null, $name); @@ -304,8 +304,8 @@ class AtomParser { function xml_escape($string) { - return str_replace(array('&','"',"'",'<','>'), - array('&','"',''','<','>'), + return str_replace(array('&','"',"'",'<','>'), + array('&','"',''','<','>'), $string ); } } diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php index ac15a28d92..1049554497 100644 --- a/wp-includes/author-template.php +++ b/wp-includes/author-template.php @@ -300,10 +300,10 @@ function the_author_posts() { /* the_author_posts_link() requires no get_, use get_author_posts_url() */ function the_author_posts_link($deprecated = '') { global $authordata; - printf( - '%3$s', - get_author_posts_url( $authordata->ID, $authordata->user_nicename ), - sprintf( __( 'Posts by %s' ), attribute_escape( get_the_author() ) ), + printf( + '%3$s', + get_author_posts_url( $authordata->ID, $authordata->user_nicename ), + sprintf( __( 'Posts by %s' ), attribute_escape( get_the_author() ) ), get_the_author() ); } @@ -363,9 +363,9 @@ function get_author_name( $auth_id ) { function wp_list_authors($args = '') { global $wpdb; - $defaults = array( - 'optioncount' => false, 'exclude_admin' => true, - 'show_fullname' => false, 'hide_empty' => true, + $defaults = array( + 'optioncount' => false, 'exclude_admin' => true, + 'show_fullname' => false, 'hide_empty' => true, 'feed' => '', 'feed_image' => '', 'echo' => true ); diff --git a/wp-includes/bookmark-template.php b/wp-includes/bookmark-template.php index 89817427a1..9e85daf612 100644 --- a/wp-includes/bookmark-template.php +++ b/wp-includes/bookmark-template.php @@ -16,11 +16,11 @@ function wp_get_links($args = '') { } $defaults = array( - 'category' => -1, 'before' => '', - 'after' => '
    ', 'between' => ' ', - 'show_images' => true, 'orderby' => 'name', - 'show_description' => true, 'show_rating' => false, - 'limit' => -1, 'show_updated' => true, + 'category' => -1, 'before' => '', + 'after' => '
    ', 'between' => ' ', + 'show_images' => true, 'orderby' => 'name', + 'show_description' => true, 'show_rating' => false, + 'limit' => -1, 'show_updated' => true, 'echo' => true ); @@ -241,8 +241,8 @@ function get_links_list($order = 'name', $hide_if_empty = 'obsolete') { function _walk_bookmarks($bookmarks, $args = '' ) { $defaults = array( - 'show_updated' => 0, 'show_description' => 0, - 'show_images' => 1, 'before' => '

  • ', + 'show_updated' => 0, 'show_description' => 0, + 'show_images' => 1, 'before' => '
  • ', 'after' => '
    • ', 'between' => "\n" ); @@ -264,8 +264,8 @@ function _walk_bookmarks($bookmarks, $args = '' ) { if ( '' != $rel ) $rel = ' rel="' . $rel . '"'; - $desc = attribute_escape(apply_filters('link_description', $bookmark->link_description)); - $name = attribute_escape(apply_filters('link_title', $bookmark->link_name)); + $desc = attribute_escape(apply_filters('link_description', $bookmark->link_description)); + $name = attribute_escape(apply_filters('link_title', $bookmark->link_name)); $title = $desc; if ( $show_updated ) @@ -315,14 +315,14 @@ function _walk_bookmarks($bookmarks, $args = '' ) { function wp_list_bookmarks($args = '') { $defaults = array( - 'orderby' => 'name', 'order' => 'ASC', - 'limit' => -1, 'category' => '', - 'category_name' => '', 'hide_invisible' => 1, - 'show_updated' => 0, 'echo' => 1, - 'categorize' => 1, 'title_li' => __('Bookmarks'), - 'title_before' => '

    ', 'title_after' => '

    ', - 'category_orderby' => 'name', 'category_order' => 'ASC', - 'class' => 'linkcat', 'category_before' => '
  • ', + 'orderby' => 'name', 'order' => 'ASC', + 'limit' => -1, 'category' => '', + 'category_name' => '', 'hide_invisible' => 1, + 'show_updated' => 0, 'echo' => 1, + 'categorize' => 1, 'title_li' => __('Bookmarks'), + 'title_before' => '

    ', 'title_after' => '

    ', + 'category_orderby' => 'name', 'category_order' => 'ASC', + 'class' => 'linkcat', 'category_before' => '
  • ', 'category_after' => '
    • ' ); diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php index 997847c3d3..a8c1a3f3be 100644 --- a/wp-includes/bookmark.php +++ b/wp-includes/bookmark.php @@ -45,10 +45,10 @@ function get_bookmarks($args = '') { global $wpdb; $defaults = array( - 'orderby' => 'name', 'order' => 'ASC', - 'limit' => -1, 'category' => '', - 'category_name' => '', 'hide_invisible' => 1, - 'show_updated' => 0, 'include' => '', + 'orderby' => 'name', 'order' => 'ASC', + 'limit' => -1, 'category' => '', + 'category_name' => '', 'hide_invisible' => 1, + 'show_updated' => 0, 'include' => '', 'exclude' => '' ); @@ -94,7 +94,7 @@ function get_bookmarks($args = '') { $exclusions .= ')'; if ( ! empty($category_name) ) { - if ( $category = get_term_by('name', $category_name, 'link_category') ) + if ( $category = get_term_by('name', $category_name, 'link_category') ) $category = $category->term_id; } @@ -173,7 +173,7 @@ function sanitize_bookmark($bookmark, $context = 'display') { if ( $do_object ) $bookmark->$field = sanitize_bookmark_field($field, $bookmark->$field, $bookmark->link_id, $context); else - $bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $bookmark['link_id'], $context); + $bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $bookmark['link_id'], $context); } return $bookmark; @@ -191,7 +191,7 @@ function sanitize_bookmark_field($field, $value, $bookmark_id, $context) { if ( 'link_target' == $field ) { $targets = array('_top', '_blank'); if ( ! in_array($value, $targets) ) - $value = ''; + $value = ''; } if ( 'raw' == $context ) diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index 3558c4dcc7..3ab8d89a7a 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -46,7 +46,7 @@ function redirect_canonical() { if ( $redirect_url ) $redirect['query'] = remove_query_arg('m', $redirect['query']); // now moving on to non ?m=X year/month/day links - } elseif ( is_day() && get_query_var('year') && get_query_var('monthnum') && isset($_GET['day']) ) { + } elseif ( is_day() && get_query_var('year') && get_query_var('monthnum') && isset($_GET['day']) ) { if ( $redirect_url = get_day_link(get_query_var('year'), get_query_var('monthnum'), get_query_var('day')) ) $redirect['query'] = remove_query_arg(array('year', 'monthnum', 'day'), $redirect['query']); } elseif ( is_month() && get_query_var('year') && isset($_GET['monthnum']) ) { diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index 3b29e7c1a9..02b7be5cc6 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -86,13 +86,13 @@ function _usort_terms_by_name($a, $b) { return strcmp($a->name, $b->name); } -function _usort_terms_by_ID($a, $b) { - if ( $a->term_id > $b->term_id ) - return 1; - elseif ( $a->term_id < $b->term_id ) - return -1; - else - return 0; +function _usort_terms_by_ID($a, $b) { + if ( $a->term_id > $b->term_id ) + return 1; + elseif ( $a->term_id < $b->term_id ) + return -1; + else + return 0; } function get_the_category_by_ID($cat_ID) { @@ -185,12 +185,12 @@ function category_description($category = 0) { function wp_dropdown_categories($args = '') { $defaults = array( - 'show_option_all' => '', 'show_option_none' => '', - 'orderby' => 'ID', 'order' => 'ASC', - 'show_last_update' => 0, 'show_count' => 0, - 'hide_empty' => 1, 'child_of' => 0, - 'exclude' => '', 'echo' => 1, - 'selected' => 0, 'hierarchical' => 0, + 'show_option_all' => '', 'show_option_none' => '', + 'orderby' => 'ID', 'order' => 'ASC', + 'show_last_update' => 0, 'show_count' => 0, + 'hide_empty' => 1, 'child_of' => 0, + 'exclude' => '', 'echo' => 1, + 'selected' => 0, 'hierarchical' => 0, 'name' => 'cat', 'class' => 'postform' ); @@ -235,12 +235,12 @@ function wp_dropdown_categories($args = '') { function wp_list_categories($args = '') { $defaults = array( - 'show_option_all' => '', 'orderby' => 'name', - 'order' => 'ASC', 'show_last_update' => 0, - 'style' => 'list', 'show_count' => 0, - 'hide_empty' => 1, 'use_desc_for_title' => 1, - 'child_of' => 0, 'feed' => '', - 'feed_image' => '', 'exclude' => '', + 'show_option_all' => '', 'orderby' => 'name', + 'order' => 'ASC', 'show_last_update' => 0, + 'style' => 'list', 'show_count' => 0, + 'hide_empty' => 1, 'use_desc_for_title' => 1, + 'child_of' => 0, 'feed' => '', + 'feed_image' => '', 'exclude' => '', 'hierarchical' => true, 'title_li' => __('Categories') ); @@ -271,7 +271,7 @@ function wp_list_categories($args = '') { global $wp_query; if( !empty($show_option_all) ) - if ('list' == $style ) + if ('list' == $style ) $output .= '
  • ' . $show_option_all . '
    • '; else $output .= '' . $show_option_all . ''; @@ -295,7 +295,7 @@ function wp_list_categories($args = '') { function wp_tag_cloud( $args = '' ) { $defaults = array( - 'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 45, + 'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 45, 'format' => 'flat', 'orderby' => 'name', 'order' => 'ASC', 'exclude' => '', 'include' => '' ); @@ -417,14 +417,14 @@ function get_tag_link( $tag_id ) { } function get_the_tags( $id = 0 ) { - global $post; + global $post; $id = (int) $id; - if ( ! $id && ! in_the_loop() ) - return false; // in-the-loop function + if ( ! $id && ! in_the_loop() ) + return false; // in-the-loop function - if ( !$id ) + if ( !$id ) $id = (int) $post->ID; $tags = get_object_term_cache($id, 'post_tag'); @@ -432,9 +432,9 @@ function get_the_tags( $id = 0 ) { $tags = wp_get_object_terms($id, 'post_tag'); $tags = apply_filters( 'get_the_tags', $tags ); - if ( empty( $tags ) ) - return false; - return $tags; + if ( empty( $tags ) ) + return false; + return $tags; } function get_the_tag_list( $before = '', $sep = '', $after = '' ) { diff --git a/wp-includes/category.php b/wp-includes/category.php index 92ab6d9d8b..cd12e591fe 100644 --- a/wp-includes/category.php +++ b/wp-includes/category.php @@ -102,20 +102,20 @@ function get_cat_name($cat_id) { return $category->name; } -function cat_is_ancestor_of($cat1, $cat2) { - if ( is_int($cat1) ) - $cat1 = & get_category($cat1); - if ( is_int($cat2) ) - $cat2 = & get_category($cat2); +function cat_is_ancestor_of($cat1, $cat2) { + if ( is_int($cat1) ) + $cat1 = & get_category($cat1); + if ( is_int($cat2) ) + $cat2 = & get_category($cat2); - if ( !$cat1->term_id || !$cat2->parent ) - return false; + if ( !$cat1->term_id || !$cat2->parent ) + return false; - if ( $cat2->parent == $cat1->term_id ) - return true; + if ( $cat2->parent == $cat1->term_id ) + return true; - return cat_is_ancestor_of($cat1, get_category($cat2->parent)); -} + return cat_is_ancestor_of($cat1, get_category($cat2->parent)); +} function sanitize_category($category, $context = 'display') { return sanitize_term($category, 'category', $context); diff --git a/wp-includes/class-IXR.php b/wp-includes/class-IXR.php index 842d4fad3e..2b23a1d135 100644 --- a/wp-includes/class-IXR.php +++ b/wp-includes/class-IXR.php @@ -1,5 +1,5 @@ _currentTagContents = ''; - } + } } @@ -379,7 +379,7 @@ EOD; 'specUrl' => 'http://www.xmlrpc.com/discuss/msgReader$1208', 'specVersion' => 1 ), - ); + ); } function getCapabilities($args) { return $this->capabilities; @@ -584,7 +584,7 @@ class IXR_Error { - + EOD; return $xml; @@ -658,27 +658,27 @@ class IXR_IntrospectionServer extends IXR_Server { 'specVersion' => 1 ); $this->addCallback( - 'system.methodSignature', - 'this:methodSignature', - array('array', 'string'), + 'system.methodSignature', + 'this:methodSignature', + array('array', 'string'), 'Returns an array describing the return type and required parameters of a method' ); $this->addCallback( - 'system.getCapabilities', - 'this:getCapabilities', - array('struct'), + 'system.getCapabilities', + 'this:getCapabilities', + array('struct'), 'Returns a struct describing the XML-RPC specifications supported by this server' ); $this->addCallback( - 'system.listMethods', - 'this:listMethods', - array('array'), + 'system.listMethods', + 'this:listMethods', + array('array'), 'Returns an array of available methods on this server' ); $this->addCallback( - 'system.methodHelp', - 'this:methodHelp', - array('string', 'string'), + 'system.methodHelp', + 'this:methodHelp', + array('string', 'string'), 'Returns a documentation string for the specified method' ); } diff --git a/wp-includes/class-phpmailer.php b/wp-includes/class-phpmailer.php index a6c096d324..acacabb39d 100644 --- a/wp-includes/class-phpmailer.php +++ b/wp-includes/class-phpmailer.php @@ -96,7 +96,7 @@ class PHPMailer var $AltBody = ""; /** - * Sets word wrapping on the body of the message to a given number of + * Sets word wrapping on the body of the message to a given number of * characters. * @var int */ @@ -115,8 +115,8 @@ class PHPMailer var $Sendmail = "/usr/sbin/sendmail"; /** - * Path to PHPMailer plugins. This is now only useful if the SMTP class - * is in a different directory than the PHP include path. + * Path to PHPMailer plugins. This is now only useful if the SMTP class + * is in a different directory than the PHP include path. * @var string */ var $PluginDir = ""; @@ -186,7 +186,7 @@ class PHPMailer var $Password = ""; /** - * Sets the SMTP server timeout in seconds. This function will not + * Sets the SMTP server timeout in seconds. This function will not * work with the win32 version. * @var int */ @@ -199,9 +199,9 @@ class PHPMailer var $SMTPDebug = false; /** - * Prevents the SMTP connection from being closed after each mail - * sending. If this is set to true then to close the connection - * requires an explicit call to SmtpClose(). + * Prevents the SMTP connection from being closed after each mail + * sending. If this is set to true then to close the connection + * requires an explicit call to SmtpClose(). * @var bool */ var $SMTPKeepAlive = false; @@ -228,7 +228,7 @@ class PHPMailer ///////////////////////////////////////////////// /** - * Sets message type to HTML. + * Sets message type to HTML. * @param bool $bool * @return void */ @@ -264,7 +264,7 @@ class PHPMailer } /** - * Sets Mailer to send message using the qmail MTA. + * Sets Mailer to send message using the qmail MTA. * @return void */ function IsQmail() { @@ -278,7 +278,7 @@ class PHPMailer ///////////////////////////////////////////////// /** - * Adds a "To" address. + * Adds a "To" address. * @param string $address * @param string $name * @return void @@ -292,7 +292,7 @@ class PHPMailer /** * Adds a "Cc" address. Note: this function works * with the SMTP mailer on win32, not with the "mail" - * mailer. + * mailer. * @param string $address * @param string $name * @return void @@ -306,7 +306,7 @@ class PHPMailer /** * Adds a "Bcc" address. Note: this function works * with the SMTP mailer on win32, not with the "mail" - * mailer. + * mailer. * @param string $address * @param string $name * @return void @@ -318,7 +318,7 @@ class PHPMailer } /** - * Adds a "Reply-to" address. + * Adds a "Reply-to" address. * @param string $address * @param string $name * @return void @@ -337,7 +337,7 @@ class PHPMailer /** * Creates message and assigns Mailer. If the message is * not sent successfully then it returns false. Use the ErrorInfo - * variable to view description of the error. + * variable to view description of the error. * @return bool */ function Send() { @@ -384,7 +384,7 @@ class PHPMailer } /** - * Sends mail using the $Sendmail program. + * Sends mail using the $Sendmail program. * @access private * @return bool */ @@ -414,7 +414,7 @@ class PHPMailer } /** - * Sends mail using the PHP mail() function. + * Sends mail using the PHP mail() function. * @access private * @return bool */ @@ -431,7 +431,7 @@ class PHPMailer $old_from = ini_get("sendmail_from"); ini_set("sendmail_from", $this->Sender); $params = sprintf("-oi -f %s", $this->Sender); - $rt = @mail($to, $this->EncodeHeader($this->Subject), $body, + $rt = @mail($to, $this->EncodeHeader($this->Subject), $body, $header, $params); } else @@ -518,7 +518,7 @@ class PHPMailer } /** - * Initiates a connection to an SMTP server. Returns false if the + * Initiates a connection to an SMTP server. Returns false if the * operation failed. * @access private * @return bool @@ -529,7 +529,7 @@ class PHPMailer $this->smtp->do_debug = $this->SMTPDebug; $hosts = explode(";", $this->Host); $index = 0; - $connection = ($this->smtp->Connected()); + $connection = ($this->smtp->Connected()); // Retry while there is no connection while($index < count($hosts) && $connection == false) @@ -551,7 +551,7 @@ class PHPMailer if($this->SMTPAuth) { - if(!$this->smtp->Authenticate($this->Username, + if(!$this->smtp->Authenticate($this->Username, $this->Password)) { $this->SetError($this->Lang("authenticate")); @@ -585,7 +585,7 @@ class PHPMailer } /** - * Sets the language for all class error messages. Returns false + * Sets the language for all class error messages. Returns false * if it cannot load the language file. The default language type * is English. * @param string $lang_type Type of language (e.g. Portuguese: "br") @@ -613,7 +613,7 @@ class PHPMailer ///////////////////////////////////////////////// /** - * Creates recipient headers. + * Creates recipient headers. * @access private * @return string */ @@ -631,7 +631,7 @@ class PHPMailer } /** - * Formats an address correctly. + * Formats an address correctly. * @access private * @return string */ @@ -640,7 +640,7 @@ class PHPMailer $formatted = $addr[0]; else { - $formatted = $this->EncodeHeader($addr[1], 'phrase') . " <" . + $formatted = $this->EncodeHeader($addr[1], 'phrase') . " <" . $addr[0] . ">"; } @@ -650,7 +650,7 @@ class PHPMailer /** * Wraps message for use with mailers that do not * automatically perform wrapping and for quoted-printable. - * Original written by philippe. + * Original written by philippe. * @access private * @return string */ @@ -712,7 +712,7 @@ class PHPMailer else { $buf_o = $buf; - $buf .= ($e == 0) ? $word : (" " . $word); + $buf .= ($e == 0) ? $word : (" " . $word); if (strlen($buf) > $length and $buf_o != "") { @@ -750,7 +750,7 @@ class PHPMailer } /** - * Assembles message header. + * Assembles message header. * @access private * @return string */ @@ -782,7 +782,7 @@ class PHPMailer $from = array(); $from[0][0] = trim($this->From); $from[0][1] = $this->FromName; - $result .= $this->AddrAppend("From", $from); + $result .= $this->AddrAppend("From", $from); // sendmail and mail() extract Bcc from the header before sending if((($this->Mailer == "sendmail") || ($this->Mailer == "mail")) && (count($this->bcc) > 0)) @@ -800,14 +800,14 @@ class PHPMailer if($this->ConfirmReadingTo != "") { - $result .= $this->HeaderLine("Disposition-Notification-To", + $result .= $this->HeaderLine("Disposition-Notification-To", "<" . trim($this->ConfirmReadingTo) . ">"); } // Add custom headers for($index = 0; $index < count($this->CustomHeader); $index++) { - $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), + $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1]))); } $result .= $this->HeaderLine("MIME-Version", "1.0"); @@ -824,8 +824,8 @@ class PHPMailer case "alt_attachments": if($this->InlineImageExists()) { - $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", - "multipart/related", $this->LE, $this->LE, + $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", + "multipart/related", $this->LE, $this->LE, $this->boundary[1], $this->LE); } else @@ -859,11 +859,11 @@ class PHPMailer switch($this->message_type) { case "alt": - $result .= $this->GetBoundary($this->boundary[1], "", + $result .= $this->GetBoundary($this->boundary[1], "", "text/plain", ""); $result .= $this->EncodeString($this->AltBody, $this->Encoding); $result .= $this->LE.$this->LE; - $result .= $this->GetBoundary($this->boundary[1], "", + $result .= $this->GetBoundary($this->boundary[1], "", "text/html", ""); $result .= $this->EncodeString($this->Body, $this->Encoding); @@ -885,18 +885,18 @@ class PHPMailer $result .= sprintf("--%s%s", $this->boundary[1], $this->LE); $result .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", - "multipart/alternative", $this->LE, + "multipart/alternative", $this->LE, $this->boundary[2], $this->LE.$this->LE); // Create text body - $result .= $this->GetBoundary($this->boundary[2], "", + $result .= $this->GetBoundary($this->boundary[2], "", "text/plain", "") . $this->LE; $result .= $this->EncodeString($this->AltBody, $this->Encoding); $result .= $this->LE.$this->LE; // Create the HTML body - $result .= $this->GetBoundary($this->boundary[2], "", + $result .= $this->GetBoundary($this->boundary[2], "", "text/html", "") . $this->LE; $result .= $this->EncodeString($this->Body, $this->Encoding); @@ -924,7 +924,7 @@ class PHPMailer if($encoding == "") { $encoding = $this->Encoding; } $result .= $this->TextLine("--" . $boundary); - $result .= sprintf("Content-Type: %s; charset = \"%s\"", + $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet); $result .= $this->LE; $result .= $this->HeaderLine("Content-Transfer-Encoding", $encoding); @@ -938,7 +938,7 @@ class PHPMailer * @access private */ function EndBoundary($boundary) { - return $this->LE . "--" . $boundary . "--" . $this->LE; + return $this->LE . "--" . $boundary . "--" . $this->LE; } /** @@ -992,7 +992,7 @@ class PHPMailer * @param string $type File extension (MIME) type. * @return bool */ - function AddAttachment($path, $name = "", $encoding = "base64", + function AddAttachment($path, $name = "", $encoding = "base64", $type = "application/octet-stream") { if(!@is_file($path)) { @@ -1051,7 +1051,7 @@ class PHPMailer if($disposition == "inline") $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE); - $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", + $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $name, $this->LE.$this->LE); // Encode as string attachment @@ -1063,7 +1063,7 @@ class PHPMailer } else { - $mime[] = $this->EncodeFile($path, $encoding); + $mime[] = $this->EncodeFile($path, $encoding); if($this->IsError()) { return ""; } $mime[] = $this->LE.$this->LE; } @@ -1129,7 +1129,7 @@ class PHPMailer } /** - * Encode a header string to best of Q, B, quoted or none. + * Encode a header string to best of Q, B, quoted or none. * @access private * @return string */ @@ -1182,7 +1182,7 @@ class PHPMailer } /** - * Encode string to quoted-printable. + * Encode string to quoted-printable. * @access private * @return string */ @@ -1205,7 +1205,7 @@ class PHPMailer } /** - * Encode string to q encoding. + * Encode string to q encoding. * @access private * @return string */ @@ -1243,7 +1243,7 @@ class PHPMailer * @param string $type File extension (MIME) type. * @return void */ - function AddStringAttachment($string, $filename, $encoding = "base64", + function AddStringAttachment($string, $filename, $encoding = "base64", $type = "application/octet-stream") { // Append to $attachment array $cur = count($this->attachment); @@ -1258,19 +1258,19 @@ class PHPMailer } /** - * Adds an embedded attachment. This can include images, sounds, and - * just about any other document. Make sure to set the $type to an - * image type. For JPEG images use "image/jpeg" and for GIF images + * Adds an embedded attachment. This can include images, sounds, and + * just about any other document. Make sure to set the $type to an + * image type. For JPEG images use "image/jpeg" and for GIF images * use "image/gif". * @param string $path Path to the attachment. - * @param string $cid Content ID of the attachment. Use this to identify + * @param string $cid Content ID of the attachment. Use this to identify * the Id for accessing the image in an HTML form. * @param string $name Overrides the attachment name. * @param string $encoding File encoding (see $Encoding). - * @param string $type File extension (MIME) type. + * @param string $type File extension (MIME) type. * @return bool */ - function AddEmbeddedImage($path, $cid, $name = "", $encoding = "base64", + function AddEmbeddedImage($path, $cid, $name = "", $encoding = "base64", $type = "application/octet-stream") { if(!@is_file($path)) @@ -1397,7 +1397,7 @@ class PHPMailer } /** - * Returns the proper RFC 822 formatted date. + * Returns the proper RFC 822 formatted date. * @access private * @return string */ @@ -1412,8 +1412,8 @@ class PHPMailer } /** - * Returns the appropriate server variable. Should work with both - * PHP 4.1.0+ as well as older versions. Returns an empty string + * Returns the appropriate server variable. Should work with both + * PHP 4.1.0+ as well as older versions. Returns an empty string * if nothing is found. * @access private * @return mixed @@ -1475,7 +1475,7 @@ class PHPMailer } /** - * Changes every end of line from CR or LF to CRLF. + * Changes every end of line from CR or LF to CRLF. * @access private * @return string */ @@ -1487,7 +1487,7 @@ class PHPMailer } /** - * Adds a custom header. + * Adds a custom header. * @return void */ function AddCustomHeader($custom_header) { diff --git a/wp-includes/class-pop3.php b/wp-includes/class-pop3.php index db156930cd..aa36c48f23 100644 --- a/wp-includes/class-pop3.php +++ b/wp-includes/class-pop3.php @@ -1,4 +1,4 @@ -rawheaders)) { diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index 7525519ea7..99fecfe81a 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -289,7 +289,7 @@ function comments_template( $file = '/comments.php' ) { // TODO: Use API instead of SELECTs. if ( $user_ID) { $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND (comment_approved = '1' OR ( user_id = '$user_ID' AND comment_approved = '0' ) ) ORDER BY comment_date"); - } else if ( empty($comment_author) ) { + } else if ( empty($comment_author) ) { $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND comment_approved = '1' ORDER BY comment_date"); } else { $author_db = $wpdb->escape($comment_author); diff --git a/wp-includes/feed-atom-comments.php b/wp-includes/feed-atom-comments.php index a05f17dfce..ee9a73b401 100644 --- a/wp-includes/feed-atom-comments.php +++ b/wp-includes/feed-atom-comments.php @@ -7,7 +7,7 @@ echo '' xml:lang="" > - <?php + <title type="text"><?php if ( is_singular() ) printf(__('Comments on: %s'), get_the_title_rss()); elseif ( is_search() ) diff --git a/wp-includes/feed-rss2-comments.php b/wp-includes/feed-rss2-comments.php index 047c122c69..7bd5ae2954 100644 --- a/wp-includes/feed-rss2-comments.php +++ b/wp-includes/feed-rss2-comments.php @@ -1,10 +1,10 @@ <?php header('Content-Type: text/xml;charset=' . get_option('blog_charset'), true); -echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; +echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?> <!-- generator="wordpress/<?php echo $wp_version ?>" --> -<rss version="2.0" +<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" > diff --git a/wp-includes/feed.php b/wp-includes/feed.php index cac3b09dc3..88064c99a9 100644 --- a/wp-includes/feed.php +++ b/wp-includes/feed.php @@ -156,11 +156,11 @@ function get_the_category_rss($type = 'rss') { $filter = 'raw'; if ( !empty($categories) ) foreach ( (array) $categories as $category ) { - $cat_names[] = sanitize_term_field('name', $category->name, $category->term_id, 'category', $filter); + $cat_names[] = sanitize_term_field('name', $category->name, $category->term_id, 'category', $filter); } if ( !empty($tags) ) foreach ( (array) $tags as $tag ) { - $cat_names[] = sanitize_term_field('name', $tag->name, $tag->term_id, 'post_tag', $filter); + $cat_names[] = sanitize_term_field('name', $tag->name, $tag->term_id, 'post_tag', $filter); } $cat_names = array_unique($cat_names); diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index cb23ab50bb..ebcd80610d 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -17,7 +17,7 @@ function wptexturize($text) { $cockneyreplace = array("’tain’t","’twere","’twas","’tis","’twill","’til","’bout","’nuff","’round","’cause"); } - $static_characters = array_merge(array('---', ' -- ', '--', 'xn–', '...', '``', '\'s', '\'\'', ' (tm)'), $cockney); + $static_characters = array_merge(array('---', ' -- ', '--', 'xn–', '...', '``', '\'s', '\'\'', ' (tm)'), $cockney); $static_replacements = array_merge(array('—', ' — ', '–', 'xn--', '…', '“', '’s', '”', ' ™'), $cockneyreplace); $dynamic_characters = array('/\'(\d\d(?:’|\')?s)/', '/(\s|\A|")\'/', '/(\d+)"/', '/(\d+)\'/', '/(\S)\'([^\'\s])/', '/(\s|\A)"(?!\s)/', '/"(\s|\S|\Z)/', '/\'([\s.]|\Z)/', '/(\d+)x(\d+)/'); @@ -131,7 +131,7 @@ function utf8_uri_encode( $utf8_string, $length = 0 ) { if ( $value < 128 ) { if ( $length && ( strlen($unicode) + 1 > $length ) ) - break; + break; $unicode .= chr($value); } else { if ( count( $values ) == 0 ) $num_octets = ( $value < 224 ) ? 2 : 3; @@ -650,13 +650,13 @@ function convert_smilies($text) { if (get_option('use_smilies')) { // HTML loop taken from texturize function, could possible be consolidated $textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between - $stop = count($textarr);// loop stuff - for ($i = 0; $i < $stop; $i++) { - $content = $textarr[$i]; - if ((strlen($content) > 0) && ('<' != $content{0})) { // If it's not a tag - $content = preg_replace($wp_smiliessearch, $wp_smiliesreplace, $content); - } - $output .= $content; + $stop = count($textarr);// loop stuff + for ($i = 0; $i < $stop; $i++) { + $content = $textarr[$i]; + if ((strlen($content) > 0) && ('<' != $content{0})) { // If it's not a tag + $content = preg_replace($wp_smiliessearch, $wp_smiliesreplace, $content); + } + $output .= $content; } } else { // return default text. @@ -1085,7 +1085,7 @@ function clean_url( $url, $protocols = null ) { $url = str_replace($strip, '', $url); $url = str_replace(';//', '://', $url); /* If the URL doesn't appear to contain a scheme, we - * presume it needs http:// appended (unless a relative + * presume it needs http:// appended (unless a relative * link starting with / or a php file). */ if ( strpos($url, ':') === false && @@ -1094,7 +1094,7 @@ function clean_url( $url, $protocols = null ) { $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url); if ( !is_array($protocols) ) - $protocols = array('http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet'); + $protocols = array('http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet'); if ( wp_kses_bad_protocol( $url, $protocols ) != $url ) return ''; diff --git a/wp-includes/functions.php b/wp-includes/functions.php index d031dd769e..f8ae949a2e 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -8,9 +8,9 @@ function mysql2date($dateformatstring, $mysqlstring, $translate = true) { if ( empty($m) ) { return false; } - $i = mktime( - (int) substr( $m, 11, 2 ), (int) substr( $m, 14, 2 ), (int) substr( $m, 17, 2 ), - (int) substr( $m, 5, 2 ), (int) substr( $m, 8, 2 ), (int) substr( $m, 0, 4 ) + $i = mktime( + (int) substr( $m, 11, 2 ), (int) substr( $m, 14, 2 ), (int) substr( $m, 17, 2 ), + (int) substr( $m, 5, 2 ), (int) substr( $m, 8, 2 ), (int) substr( $m, 0, 4 ) ); if( 'U' == $dateformatstring ) @@ -182,9 +182,9 @@ function get_option($setting) { global $wpdb; // Allow plugins to short-circuit options. - $pre = apply_filters( 'pre_option_' . $setting, false ); - if ( false !== $pre ) - return $pre; + $pre = apply_filters( 'pre_option_' . $setting, false ); + if ( false !== $pre ) + return $pre; // prevent non-existent options from triggering multiple queries $notoptions = wp_cache_get('notoptions', 'options'); @@ -1203,7 +1203,7 @@ function wp_die( $message, $title = '' ) { <title><?php echo $title ?> -text_direction) ) : ?> @@ -1220,13 +1220,13 @@ if ( ( $wp_locale ) && ('rtl' == $wp_locale->text_direction) ) : ?> } function _config_wp_home($url = '') { - if ( defined( 'WP_HOME' ) ) + if ( defined( 'WP_HOME' ) ) return WP_HOME; else return $url; } function _config_wp_siteurl($url = '') { - if ( defined( 'WP_SITEURL' ) ) + if ( defined( 'WP_SITEURL' ) ) return WP_SITEURL; else return $url; } diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 23cea80a2a..84781104ad 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -64,9 +64,9 @@ function bloginfo($show='') { } /** - * Note: some of these values are DEPRECATED. Meaning they could be - * taken out at any time and shouldn't be relied upon. Options - * without "// DEPRECATED" are the preferred and recommended ways + * Note: some of these values are DEPRECATED. Meaning they could be + * taken out at any time and shouldn't be relied upon. Options + * without "// DEPRECATED" are the preferred and recommended ways * to get the information. */ function get_bloginfo($show = '', $filter = 'raw') { @@ -341,8 +341,8 @@ function wp_get_archives($args = '') { global $wpdb, $wp_locale; $defaults = array( - 'type' => 'monthly', 'limit' => '', - 'format' => 'html', 'before' => '', + 'type' => 'monthly', 'limit' => '', + 'format' => 'html', 'before' => '', 'after' => '', 'show_post_count' => false ); @@ -390,7 +390,7 @@ function wp_get_archives($args = '') { foreach ( $arcresults as $arcresult ) { $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 ) + if ( $show_post_count ) $after = ' ('.$arcresult->posts.')' . $afterafter; echo get_archives_link($url, $text, $format, $before, $after); } @@ -836,8 +836,8 @@ function user_can_richedit() { global $wp_rich_edit, $pagenow; if ( !isset( $wp_rich_edit) ) { - if ( get_user_option( 'rich_editing' ) == 'true' && - ( ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval($match[1]) >= 420 ) || + if ( get_user_option( 'rich_editing' ) == 'true' && + ( ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval($match[1]) >= 420 ) || !preg_match( '!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT'] ) ) && 'comment.php' != $pagenow ) { $wp_rich_edit = true; @@ -901,7 +901,7 @@ function the_editor($content, $id = 'content', $prev_id = 'title') { var startPos = myField.selectionStart; var endPos = myField.selectionEnd; myField.value = myField.value.substring(0, startPos) - + myValue + + myValue + myField.value.substring(endPos, myField.value.length); myField.focus(); myField.selectionStart = startPos + myValue.length; @@ -987,7 +987,7 @@ function language_attributes() { } function paginate_links( $args = '' ) { - $defaults = array( + $defaults = array( 'base' => '%_%', // http://example.com/all_posts.php%_% : %_% is replaced by format (below) 'format' => '?page=%#%', // ?page=%#% : %#% is replaced by the page number 'total' => 1, @@ -1072,7 +1072,7 @@ function wp_admin_css_uri( $file = 'wp-admin' ) { $_file = add_query_arg( 'version', get_bloginfo( 'version' ), "./$file.css" ); } else { $_file = add_query_arg( 'version', get_bloginfo( 'version' ), get_option( 'siteurl' ) . "/wp-admin/$file.css" ); - } + } return apply_filters( 'wp_admin_css_uri', $_file, $file ); } diff --git a/wp-includes/js/tinymce/wp-mce-help.php b/wp-includes/js/tinymce/wp-mce-help.php index 09b9b35ec2..9bcdc5c8f6 100644 --- a/wp-includes/js/tinymce/wp-mce-help.php +++ b/wp-includes/js/tinymce/wp-mce-help.php @@ -90,7 +90,7 @@ header('Content-Type: text/html; charset=' . get_bloginfo('charset')); #keys .right { text-align: left; } td b { font-family: Tahoma, "Times New Roman", Times, serif } - +