Changes in branches/2.8 [11700:11729]

Location:

branches/2.8

Files:

• readme.html (modified) (2 diffs)
• wp-admin/comment.php (modified) (2 diffs)
• wp-admin/edit-form-comment.php (modified) (4 diffs)
• wp-admin/includes/comment.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-includes/comment-template.php (modified) (2 diffs)
• wp-includes/default-widgets.php (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)

branches/2.8/readme.html

@@ -9 +9 @@
 <h1 id="logo" style="text-align: center">
     <img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
-    <br /> Version 2.8.1
+    <br /> Version 2.8.2
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>
@@ -30 +30 @@
 <h1>Upgrading</h1>
 <p>Before you upgrade anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</p>
-<h2>Upgrading from any previous WordPress to 2.8.1:</h2>
+<h2>Upgrading from any previous WordPress to 2.8.2:</h2>
 <ol>
     <li>Delete your old WP files, saving ones you've modified.</li>

branches/2.8/wp-admin/comment.php

@@ -23 +23 @@
  * @param string $msg Error Message. Assumed to contain HTML and be sanitized.
  */
-function comment_footer_die( $msg ) {  //
+function comment_footer_die( $msg ) {
     echo "<div class='wrap'><p>$msg</p></div>";
     include('admin-footer.php');
@@ -120 +120 @@
 <tr>
 <th scope="row"><?php _e('URL'); ?></th>
-<td><a href='<?php echo $comment->comment_author_url; ?>'><?php echo $comment->comment_author_url; ?></a></td>
+<td><a href="<?php echo $comment->comment_author_url; ?>"><?php echo $comment->comment_author_url; ?></a></td>
 </tr>
 <?php } ?>

branches/2.8/wp-admin/edit-form-comment.php

@@ -14 +14 @@
 $form_action = 'editedcomment';
 $form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . esc_attr($comment->comment_ID) . "' />\n<input type='hidden' name='comment_post_ID' value='" . esc_attr($comment->comment_post_ID);
+$comment->comment_author_email = esc_attr($comment->comment_author_email);
 ?>
 
@@ -25 +26 @@
 <input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" />
 <input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' />
-<?php
-
-$email = esc_attr( $comment->comment_author_email );
-$url = esc_attr( $comment->comment_author_url );
-// add_meta_box('submitdiv', __('Save'), 'comment_submit_meta_box', 'comment', 'side', 'core');
-?>
 
 <div id="side-info-column" class="inner-sidebar">
@@ -96 +91 @@
     <td class="first">
     <?php
-        if ( $email ) {
+        if ( $comment->comment_author_email ) {
             printf( __( 'E-mail (%s):' ), get_comment_author_email_link( __( 'send e-mail' ), '', '' ) );
         } else {
@@ -102 +97 @@
         }
 ?></td>
-    <td><input type="text" name="newcomment_author_email" size="30" value="<?php echo esc_attr($email); ?>" tabindex="2" id="email" /></td>
+    <td><input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" tabindex="2" id="email" /></td>
 </tr>
 <tr valign="top">
     <td class="first">
     <?php
-        $url = get_comment_author_url();
-        if ( ! empty( $url ) && 'http://' != $url ) {
-            $link = "<a href='$url' rel='external nofollow' target='_blank'>" . __('visit site') . "</a>";
+        if ( ! empty( $comment->comment_author_url ) && 'http://' != $comment->comment_author_url ) {
+            $link = '<a href="' . $comment->comment_author_url . '" rel="external nofollow" target="_blank">' . __('visit site') . '</a>';
             printf( __( 'URL (%s):' ), apply_filters('get_comment_author_link', $link ) );
         } else {

branches/2.8/wp-admin/includes/comment.php

@@ -90 +90 @@
     $comment->comment_author = format_to_edit( $comment->comment_author );
     $comment->comment_author_email = format_to_edit( $comment->comment_author_email );
+    $comment->comment_author_url = format_to_edit( $comment->comment_author_url );
     $comment->comment_author_url = esc_url($comment->comment_author_url);
-    $comment->comment_author_url = format_to_edit( $comment->comment_author_url );
 
     return $comment;

branches/2.8/wp-admin/includes/template.php

@@ -2086 +2086 @@
     if ( 'http://' == $author_url )
         $author_url = '';
-    $author_url_display = $author_url;
-    $author_url_display = str_replace('http://www.', '', $author_url_display);
-    $author_url_display = str_replace('http://', '', $author_url_display);
+    $author_url_display = preg_replace('|http://(www\.)?|i', '', $author_url);
     if ( strlen($author_url_display) > 50 )
         $author_url_display = substr($author_url_display, 0, 49) . '...';

branches/2.8/wp-includes/comment-template.php

@@ -195 +195 @@
     global $comment;
     $url = ('http://' == $comment->comment_author_url) ? '' : $comment->comment_author_url;
+    $url = esc_url( $url, array('http', 'https') );
     return apply_filters('get_comment_author_url', $url);
 }
@@ -818 +819 @@
 
     $req = get_option('require_name_email');
+
+    /**
+     * Comment author information fetched from the comment cookies.
+     *
+     * @uses wp_get_current_commenter()
+     */
     $commenter = wp_get_current_commenter();
-    extract($commenter, EXTR_SKIP);
+
+    /**
+     * The name of the current comment author escaped for use in attributes.
+     */
+    $comment_author = $commenter['comment_author']; // Escaped by sanitize_comment_cookies()
+
+    /**
+     * The email address of the current comment author escaped for use in attributes.
+     */ 
+    $comment_author_email = $commenter['comment_author_email'];  // Escaped by sanitize_comment_cookies()
+
+    /**
+     * The url of the current comment author escaped for use in attributes.
+     */ 
+    $comment_author_url = esc_url($commenter['comment_author_url']);
 
     /** @todo Use API instead of SELECTs. */

branches/2.8/wp-includes/default-widgets.php

@@ -713 +713 @@
             $desc = esc_attr(strip_tags(@html_entity_decode($rss->get_description(), ENT_QUOTES, get_option('blog_charset'))));
             if ( empty($title) )
-                $title = htmlentities(strip_tags($rss->get_title()));
+                $title = esc_html(strip_tags($rss->get_title()));
             $link = esc_url(strip_tags($rss->get_permalink()));
             while ( stristr($link, 'http') != $link )

branches/2.8/wp-includes/version.php

@@ -9 +9 @@
  * @global string $wp_version
  */
-$wp_version = '2.8.1';
+$wp_version = '2.8.2';
 
 /**