diff --git a/readme.html b/readme.html index 1a81127220..a60861c5fa 100644 --- a/readme.html +++ b/readme.html @@ -70,7 +70,7 @@

XML-RPC and Atom Interface

Post via Email

You can post from an email client! To set this up go to your "Writing" options screen and fill in the connection details for your secret POP3 account. Then you need to set up wp-mail.php to execute periodically to check the mailbox for new posts. You can do it with Cron-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your wp-mail.php URL.

-

Posting is easy: Any email sent to the address you specify will be posted, with the subject as the title. It is best to keep the address discrete. The script will delete emails that are successfully posted.

+

Posting is easy: Any email sent to the address you specify will be posted, with the subject as the title. It is best to keep the address discrete. The script will delete emails that are successfully posted.

User Roles

We've eliminated user levels in order to make way for the much more flexible roles system introduced in 2.0. You can read more about Roles and Capabilities on the Codex.

diff --git a/wp-admin/comment.php b/wp-admin/comment.php index 4615872803..0c17985c63 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -79,7 +79,7 @@ function comment_footer_die( $msg ) { // $msg is assumed to contain HTML and be - +
' onclick="self.location='/wp-admin/edit-comments.php';" />
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php index 58c080c3c3..e14aabded9 100644 --- a/wp-admin/edit-link-categories.php +++ b/wp-admin/edit-link-categories.php @@ -97,7 +97,7 @@ - + diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php index 6a60b6b2e8..92b662b032 100644 --- a/wp-admin/edit-link-form.php +++ b/wp-admin/edit-link-form.php @@ -145,10 +145,10 @@ function xfn_check($class, $value = '', $deprecated = '') {

- +
- - + + @@ -258,10 +258,10 @@ function xfn_check($class, $value = '', $deprecated = '') {

-
XFN Creator:') ?>
+
- - + + diff --git a/wp-admin/import/blogware.php b/wp-admin/import/blogware.php index 05ef0148e4..6bb63a7bdf 100644 --- a/wp-admin/import/blogware.php +++ b/wp-admin/import/blogware.php @@ -86,9 +86,9 @@ function import_posts() { echo '
  • '; if ($post_id = post_exists($post_title, $post_content, $post_date)) { - printf(__('Post %s already exists.'), stripslashes($post_title)); + printf(__('Post %s already exists.'), stripslashes($post_title)); } else { - printf(__('Importing post %s...'), stripslashes($post_title)); + printf(__('Importing post %s...'), stripslashes($post_title)); $postdata = compact('post_author', 'post_date', 'post_content', 'post_title', 'post_status'); $post_id = wp_insert_post($postdata); if ( is_wp_error( $post_id ) ) { diff --git a/wp-admin/import/livejournal.php b/wp-admin/import/livejournal.php index b95c20866f..bd8394ed94 100644 --- a/wp-admin/import/livejournal.php +++ b/wp-admin/import/livejournal.php @@ -66,9 +66,9 @@ function import_posts() { echo '
  • '; if ($post_id = post_exists($post_title, $post_content, $post_date)) { - printf(__('Post %s already exists.'), stripslashes($post_title)); + printf(__('Post %s already exists.'), stripslashes($post_title)); } else { - printf(__('Importing post %s...'), stripslashes($post_title)); + printf(__('Importing post %s...'), stripslashes($post_title)); $postdata = compact('post_author', 'post_date', 'post_content', 'post_title', 'post_status'); $post_id = wp_insert_post($postdata); if ( is_wp_error( $post_id ) ) diff --git a/wp-admin/import/mt.php b/wp-admin/import/mt.php index 6802102b1e..282bae3ef3 100644 --- a/wp-admin/import/mt.php +++ b/wp-admin/import/mt.php @@ -152,7 +152,7 @@ function mt_authors_form() {

    -

    italics. For each of these names, you can either pick an author in your WordPress installation from the menu, or enter a name for the author in the textbox.'); ?>

    +

    italics. For each of these names, you can either pick an author in your WordPress installation from the menu, or enter a name for the author in the textbox.'); ?>

    post_title, '', $post->post_date) ) { echo '
  • '; - printf(__('Post %s already exists.'), stripslashes($post->post_title)); + printf(__('Post %s already exists.'), stripslashes($post->post_title)); } else { echo '
  • '; - printf(__('Importing post %s...'), stripslashes($post->post_title)); + printf(__('Importing post %s...'), stripslashes($post->post_title)); if ( '' != trim( $post->extended ) ) $post->post_content .= "\n\n$post->extended"; diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php index d832b19fcc..72635c2c1f 100644 --- a/wp-admin/import/wordpress.php +++ b/wp-admin/import/wordpress.php @@ -381,7 +381,7 @@ function process_post($post) { if ( $post_exists ) { echo '
  • '; - printf(__('Post %s already exists.'), stripslashes($post_title)); + printf(__('Post %s already exists.'), stripslashes($post_title)); } else { // If it has parent, process parent first. @@ -412,7 +412,7 @@ function process_post($post) { return $post_id; } else { - printf(__('Importing post %s...'), stripslashes($post_title)); + printf(__('Importing post %s...'), stripslashes($post_title)); $comment_post_ID = $post_id = wp_insert_post($postdata); } @@ -516,7 +516,7 @@ function process_post_meta($post_id, $key, $value) { function process_attachment($postdata, $remote_url) { if ($this->fetch_attachments and $remote_url) { - printf( __('Importing attachment %s... '), htmlspecialchars($remote_url) ); + printf( __('Importing attachment %s... '), htmlspecialchars($remote_url) ); $upload = $this->fetch_remote_file($postdata, $remote_url); if ( is_wp_error($upload) ) { printf( __('Remote file error: %s'), htmlspecialchars($upload->get_error_message()) ); @@ -551,7 +551,7 @@ function process_attachment($postdata, $remote_url) { return $post_id; } else { - printf( __('Skipping attachment %s'), htmlspecialchars($remote_url) ); + printf( __('Skipping attachment %s'), htmlspecialchars($remote_url) ); } } diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 060e5129dc..9f490d3c45 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -56,7 +56,7 @@ function _cat_row( $category, $level, $name_override = false ) {
  • - \n\t\n"; + \n\t\n"; return apply_filters('cat_row', $output); } @@ -84,7 +84,7 @@ function link_cat_row( $category ) { '' . " - "; + "; return apply_filters( 'link_cat_row', $output ); } @@ -722,7 +722,7 @@ function _list_meta_row( $entry, &$count ) { $r .= "\n\t"; $r .= "\n\t\t"; $r .= "\n\t\t"; - $r .= "\n\t\t\n\t"; @@ -749,7 +749,7 @@ function meta_form() { - ', + 'name' => '', 'url' => '', 'categories' => '', 'rel' => '', @@ -196,7 +196,7 @@ ?> diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index 89dcfab695..b46c3310d8 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -240,7 +240,7 @@ function check_pass_strength ( ) {

    -
    +

    @@ -276,8 +276,8 @@ function check_pass_strength ( ) { } ?> -
    -
    $edit $category->description$posts_count
    $posts_count
    $edit $category->description$count
    $count

    "; + $r .= "\n\t\t

    "; $r .= "\n\t\t"; $r .= "
    + ' . __('Name') . '' . __('Name') . '' . __('URL') . '' . __('Categories') . '' . __('rel') . 'link_rel; ?>
    +
    +
    caps) > count($profileuser->roles)): ?> diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php index d11462d46b..9b4ed39ebd 100644 --- a/wp-includes/author-template.php +++ b/wp-includes/author-template.php @@ -484,7 +484,7 @@ function wp_list_authors($args = '') { $link .= '>'; if ( !empty($feed_image) ) - $link .= "'; + $link .= "'; else $link .= $name; diff --git a/wp-includes/js/colorpicker.js b/wp-includes/js/colorpicker.js index 7d729db5b4..1fc32cf243 100644 --- a/wp-includes/js/colorpicker.js +++ b/wp-includes/js/colorpicker.js @@ -673,15 +673,15 @@ function ColorPicker() { var windowRef = (windowMode)?"window.opener.":""; if (windowMode) { cp_contents += "Select Color"; - cp_contents += "
    "; + cp_contents += ""; } - cp_contents += "
    "; + cp_contents += "
    "; var use_highlight = (document.getElementById || document.all)?true:false; for (var i=0; i '; + cp_contents += ''; if ( ((i+1)>=total) || (((i+1) % width) == 0)) { cp_contents += ""; } @@ -690,11 +690,11 @@ function ColorPicker() { if (document.getElementById) { var width1 = Math.floor(width/2); var width2 = width = width1; - cp_contents += ""; + cp_contents += ""; } cp_contents += "
     
     #FFFFFF
     #FFFFFF
    "; if (windowMode) { - cp_contents += ""; + cp_contents += ""; } // end populate code diff --git a/wp-includes/js/tinymce/wp-mce-help.php b/wp-includes/js/tinymce/wp-mce-help.php index 069b261fa4..591f789d2c 100644 --- a/wp-includes/js/tinymce/wp-mce-help.php +++ b/wp-includes/js/tinymce/wp-mce-help.php @@ -170,7 +170,7 @@ function init() {